Final tidying up