Made utility more modularized.