Some more typos fixed and code formatted