cleaned up drag'n'drop