Reformat again
other fixes