refactored Class to clazz