Refactor chooser fields