Final final tidying