improve simple forms