fix: better encapsulate internals (#1055)

31 files changed