improved code
improved code
improved code for utility classes