PEP8 nitpicks