Bring back double click (+ minor cleanup)