refactor variables names