added correct form class / code cleaning