Cleanups: Mostly PEP8 and styleguide recommendations, and also some typos