renamed variables and commented out unused code