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