Cleanup based on comments by William Rucklidge

Change-Id: If269ba8e388965a8ea32260fd6f17a133a19ab9b
13 files changed