if you rename the variables, rename the comments too...