Refactor choice method to use dom references, not IDs