refactoring to comply with pep8 most of the time.