Clean up local variable usage - Nova

Change-Id: Ia4896746a2f574b7fcb95f85640e0d31c50c372b
Merge "Clean up local variable usage - Nova"