Refactoring Dictionary Typedef