Change style, fix some typos