Style

A bunch of fixes I made to make the style more consistent with PEPs 8 and 257