WIP: Refactor Part 1

Mostly PEP8 changes