Refactor datagrid stuff

| Q                    | A
| -------------------- | ---
| Bug fix?             | N
| New feature?         | N
| BC breaks?           | Y
| CI currently passes? | Y
| Tests pass?          | Y
| Scenarios pass?      | ? 
| Checkstyle issues?   | N
| Changelog updated?   | N
| Fixed tickets        | -
| Doc PR               | -
Useless blank line