PEP 8

PEP8 cleanup. Branched off #73, which should be merged first.