Just a little tidying up