Fixed style and some typos