Just tidying up a little