clean up structure, part II