Remove console output
Break form up into fieldsets