more cleanup to adhere to PEP-8