Code cleanup - utils package.