Improve comments and isolate members further
Push a bunch of usages towards newer apis