One PEP8 change breaks comparator tests - reverting