Moved some public member functions to private.