Address some code comments

Change-Id: I0a38a387c4328d45bbc04d095bf3388c27495c12
4 files changed