even more tidying
merge