PEP8 tidy-up