Clean up local variable usage - Horizon

Change-Id: I1924ecdd68a9c7bf947c06f33aa79c38ada1d3b4
Merge "Clean up local variable usage - Horizon"