Cleanup

PEP8 and other stylistic cleanup