Refactor (Ordered-)Dict