Remove trailing whitespace and fix indent

Remove trailing whitespace and fix indent