Tidying up of gesture_toy