Improve encapsulation.