smidge more tidying