Fixed some typos and added some more consistency