tests passing
Remove some itertools/operator usage