Tidy up some stylistic errors