Tap gesture refactor