Refactoring property and instance variable