change variables to single dictionaries