Refactored the ViewModel