Clean code at Dup