DRY up form options
Merge pull request #135 from ministryofjustice/form_options

DRY up form options