1. Pretty much minor fixes for improving readability. Change-Id: I76efdcc574af9a277b54eeb9fb5caf34948fcfde