Improve form process