Updates per review #22

Pep8 cleanup.