tidying up

I need to knuckle down on this at some stage.