Style

A bunch of fixes I made to make the style more consistent with PEPs 8 and 257
In that case, I rule that my strong negative feelings towards it win. =D