refactor for pep-8 compliance