Pep8, with test!