Fixed up style and some typos