Address pep8 concerns