sepearated datatype templates from their main classes
removed excess callers