Refactor form code and change chore form.