Some more PEP8 cleanup before commit more changes