More style work.

Change-Id: I89c4fa3123f6a25d36971cd3f4363dba6ad7299c