minor tweaks on variable names