Refactor internal data logic (Part 2)

[Innixma]

Refactor to replace many usages of tid with dataset across the project, along with other cleanup.