improve form module