dt2w: code changes and cleanups
* No functional changes