UPDATED small refactoring to account model.