reformat and typos