Changed the visibility of some private functions