even more tidying