Refactor some things

- Integrates T5
- Form result is moved into another place to make it safer