change some naked variables to dict entires