simplify drag-drop logic a bit