tidy up WIP [ci skip]
more tidying up