remove trailing whitespace
fix more indenting