Genereal cleanup and unification of update algorithms