form class improvements