tm - cleaned up some naming and unused code