Whitespace fix and cleanup
Fixing whitespace issues.