PEP8 and cleaning