PEP8 and misc cleaning