Refactored all forms filled