Fixed some typos and code convention