Refactor Clazzes