Changed the scope of some properties and class methods to private.