Fix code style to match sane PEP8

Ignoring the 79 column rule since that is decidedly not
sane