ticket:9 pep8 cleanup