refactoring edit/new property 2