Clean up according to PEP8
Make code PEP8 compliant