PEP-8 related file cleanup