Improving MVVM 001