Cosmetic improvements.

Change-Id: I901c083cc91f564bd7eb4c7d46e1722cb450bc8d