PEP-8 and style changes

So far you are my favorite person today for this.