minor adjustments on the variable naming