Fix typo and a bit of cleanup.

Change-Id: Id32fcce20a72774794f413a8b2217aeca1c5946c