Renaming the form class
Improved code