refactoring edit properties