Done some more tidying up