cleaning up whitespace

Sidekick: @lars2893 

Cleaned up the formatting and whitespace significantly.