switched to use std::make_shared wherever possible