20140606-0554-DWDT Minor tweaks and cleanups