improved code in utility classes
improved code
improved code in utility classes
improved code for utility classes