Refactor of forms