Tidying up structure