Cleans up and enforces PEP8 again