Refactor: remove unnecessary indirection