Little more tidying up

You get the idea...