Some refactoring of variables.