Clean up source code not compliant with PEP8