Refactored Forms; reduced duplicated code