Improving variable names.