CFY-999 pep8 cleanup