Fix spelling errors and tidy up