Full PEP8 clean-up.