refactor: avoid return by reference and prefer return by value

refactor: avoid return by reference and prefer return by value #13325