Improve ClassOrInterfaceDeclaration