Improve use of variables.