i think this cleans things up quite a bit.