Tidying up
merge