remove OpenStruct and replace Hash.new with literal {}