Get rid of some leftover code using query model updaters for the account query model.
Reformat code.