We could also make this a part of the pep8 job. Any opinions?