minor tweak in variable names