PEP 8 and other clean-ups.