FIX: Simplify ordereddict