use dictionary while replacing utility macros
-rw-r--r-- 623 TODO
-rwxr-xr-x 30838 spec-cleaner