cleaned up forms, consolidated