cleaned up datatool