Change to map in drag event
Cleanup, comments