made some choice variables less ambiguous