Pep8ification, moved argument, removed comment