Refactoring for usage View Model