Reduce public surface area