fix build
DRY up form options