PEP-8 and style changes

It seems like this would fit in the line above, but I didn't actually count chars ☺