Pull out logic to update choices dict