Clean up according to PEP8 linter.