clean-up, formatting fixes

cleanup2

clean up 3

tests pass

remove printf

switching to the old version of TupleType::==