PEP-8/style fixes.