Touchup variable names; prep for side-by-side comparison (reordering lines)