Remove all trailing whitespace

Also correct all indentation