More tidying up
And some more tidying up