Whitespace Fixes

I've cleaned up a load of whitespace issues.