PEP-8 and style changes

One day I'm going to go on a rampage and delete these everywhere!