Many minor PEP8 and related cleanups