cleaned up dictionary.h interface