Whitespace cleanup.

Remove trailing spaces and use 4 spaces consistently for indentation.