PEP8-related corrections