Outdent overindented code and rename a variable for clarity

Change-Id: I8dc09f719cce463fff47d35c5195f8b948a70313
Merge "Outdent overindented code and rename a variable for clarity"