reformating and some typos