ViewModel polish.