refactor: simplify overidability