some minor changes for variable names