Clean up.  removed some unneccessary code and whitespace