I think I am done refactoring ClassUtil