Reformat and clean up typos