Moving unessesary code from the gestures