style fixes

Change-Id: I88309a4edf0e3faf27642d3fa11bb66079ff212c