refactor, DRY up modal forms