Completing pep8ification of the codebase