more refactoring of gesture recognizer