Changed some publics to privates and other small details.