Review Request 1737: PEP8, Flake8, readability improvements