minor form class simplification
formating
formating
formating