Renamed variables, commented out useless code