PEP8 improvements.