Some code cleanup to conform to PEP-8