format fixes to make code pep8 compliant (except for line length)