Improving variable naming