Additional PEP8 cleanup