PEP8-related cleanup