Forms: refactor form definitions