Move some utils