Fixed some typos and conventions