minor properties refactoring in viewmodel