PEP8-based clean-up.