Refactoring for MVVMLight