Applied kibit to clean implementation.

None of these changes should be of semantic import. They are
just neater.