Improved usage of streams for returned values