Refactor: Eliminate unnecessary struct