refactor all INofityPropertyChange instances