style fixes for code review of 874496