turned a few vars into vals