corrected variable names, preparing to introduce sparse operations