dnd improvement. little code cleaning.