Refactor Property