Pep8 modifications