Converting to PEP8

DO NOT MERGE.

This is a test and if it works ... well, merge!