Cleanup lots of whitespace