Refactor form types