Better encapsulation

Internals are now more private.