Remove return by const value