PEP8

Did some work on following PEP8 before I get to doing some actual code.