Improve basic form example