Typos and reformat