fixed most pep8 complaints