improved code in utility classes
improved code in utility classes