Refactoring NotifyPropertyChanged related code to be more straightforward