Style cleanup to conform to PEP8