Small style cleanups

Change-Id: I69d43a88b163b2ecf6992233e53a087a081f33b5