tidying up structure