Some style fixes and fixing typos