Fix formatting and other nonfunctional changes for code review