Some more style cleanups

Change-Id: If64aa4d11d063475f8ce6be900aef4ec1a450381