fix minor issues and break up long lines