reformat and fix typos