Minor adjustments, variable name change.