PEP8 overhaul 1