Cosmetic updates to make code PEP8 conformable.