WIP: PEP8 a few things