just some tydying up
merge