Refactored property vars