Clean up and follow PEP8