refactoring DragDrop prototype | some cleanup