Some PEP8, tabs and coding style cleanups.