should fix remaining pep8 violations