nonfunctional changes in unifying some formatting