ticket:10 PEP8 cleanup