Improved consistency and encapsulation.