minor changes in variable names