PEP8, cleanup