PEP-8 cleanup.
Few more PEP-8 changes (minor).