ticket:5 make code pep8 compatible