Some final tidying up