Current utils and code clean up.