Split out the call to the update method only to places where it is
actually used rather than having a mega-method that does all the stuff.