PEP8 tweaks