Refactors to use a hash for choices