Simple code clarity changes

Test: N/A
Bug: N/A
Change-Id: I2c11ef703856c158b48329dbef6485196cfc1d43
2 files changed