Refactoring ClassUtil
Still refactoring ClassUtil
Still refactoring ClassUtil