Code cleanup in DT.class