Remove more pep8 violations