PEP-8 reorg