Minor cleanup of comments and code

Change-Id: I393c9a882714f1682fa7a360e2cdd5e66a5d4e39
1 file changed