Refactor chooser components