[All][All] More formatting fixes