some tidying up..