Tidied things up

removed errant descriptions, separated the update methods from the
actual variables they updated so that I can access old values.