+Drag-n-Drop, small refactor