clean up comments and tab spacing