refactoring edit/new property 3