Just a little tidying