refactor variables name