Improving variables name