Changed some publics to private