Revert pep8 changes and use utils.lookup