More cleanup to add _public