cleanup
build support for better NotifyPropertyChanged