UK: pep8 cleanup