Fix some typos and improves formatting