tidy up structure