Make more use of unique_ptr