Many more formatting fixes throughout several files.