cleaned up forms and views