Code cleanup to PEP8 style guide