Some refactoring...
More refactoring. Change the names of variables.