* Refactor form