minor comments
rename DictMap → AODictMap
finished dictionary cleanup operations