Refactoring of property