some cleanup to conform to PEP 8