Improving MVVM 002