first batch of format fixes for presubmit checking