Some final tidying up!