improving readability, some nits fixed

Change-Id: I137f68105ef764455bdaf301c9a47c45057801f4