Spell check, formatting, tidy up