Minor code clean up
-carbon utils separated.