cleaned up drag and drop