refactor towards pep8