- Refactored the forms