clean up structure, part III