Cleanup
Whitespace cleanup