Code Cleanup according to PEP