refactored properties