refactoring in Class_expr source file