Fix some typos and improved formatting