Refactoring property
Refactoring property