Cosmetic code fixes

* Clarified comment

Change-Id: Ie10152c979ccf34efea7490176a2752c01513354