-Refactored property default value creation