Remove raw pointers and use smart pointers instead.
Remove raw pointers and use smart pointers instead.