Tidy code.

Change-Id: I752c302c85037909aa9c95090371e9030f0ff915