Move private functions into public tasks