PEP-8 and style changes

Yes!