formatting cleanup, pep8 compliance