Changed names of the DTTuple branches and some tidying up.