Minor refactor  for eventual ref chooser