Refactored wpf model