Apply pep8 recommendations