Clean up code to fit PEP8 style