Reformatted and some typo fixes