Cleanup the dictionary component.

closes #28