improved variable naming in resolve