Refactor form methods