refs #3164 Change-Id: Id857e214a727917009f865c2cfac782077844799
This commit only moves code around and renames variables. There's no functional change. refs #3164 Change-Id: Icb6b249cc0c07fcfe42f7a6d6987de31285566e7