Tidying up a number of minor commits