Doing a better job of managing the lifetime of my objects