Remove unneeded OpenStruct
Fix Heath sugar