:mouse2: mousetrap refactor is complete