Cleanup.
Extract classes to the form builders