refactoring properties