Refactor single property code to be consistent with nested property code