pep8 organization and cleanup