[working-with] tidy up gestures