Cleanup

Whitespace removal + formatting