Final pep8-ing