refactoring edit/new property