code cleanup to please the pep8 gods