Fix a couple of minor issues from foodcritic.

Change-Id: I7c1f68223b9a8d2325a5b553735b54a41ddb0e6c