autoform additional refactor