Cleanup to match PEP 8