Improve encapsulation quite a lot.