More MVVM like code for Curve viewmodel