Tidy code.

Change-Id: Ie7cfdc2986b08b4f285ba1ec6653acb55e279f68