More code cleanup on structs as suggested.