Move some private functions to public.