Refactor: Remove struct clutter
Refactor: Remove struct clutter
Refactor: Remove struct clutter