Refactor AccountViewModels