Refactoring structs