Minor clean-up and optimization in DD topology