Some more PEP8ing.