Improve simple form