Make form classes more explicit

By removing unnecessary inheritance