Changed publics to privates. Removed commented code