Fixed some typos and cosmetics