Remove trailing whitespace and fix indent