some changes for pep8 compliance