diff --git a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java
index 52c884b..650eb3d 100644
--- a/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java
+++ b/stages-tlr/code-traceability/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/codetraceability/informants/TraceLinkCombiner.java
@@ -59,7 +59,7 @@ private ImmutableSet<TraceLink<SentenceEntity, CodeCompilationUnit>> combineToTr
         for (TraceLink<SentenceEntity, ArchitectureEntity> sadSamTraceLink : sadSamTraceLinks) {
             String modelElementUid = sadSamTraceLink.getSecondEndpoint().getId();
             for (TraceLink<ArchitectureEntity, CodeCompilationUnit> samCodeTraceLink : samCodeTraceLinks) {
-                String samCodeTraceLinkModelElementId = samCodeTraceLink.asPair().first().getId();
+                String samCodeTraceLinkModelElementId = samCodeTraceLink.getFirstEndpoint().getId();
                 if (modelElementUid.equals(samCodeTraceLinkModelElementId)) {
                     var transitiveTraceLinkOptional = TransitiveTraceLink.createTransitiveTraceLink(sadSamTraceLink, samCodeTraceLink);
                     transitiveTraceLinkOptional.ifPresent(it -> transitiveTraceLinks.add(it));
diff --git a/stages-tlr/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/models/informants/ArCoTLModelProviderInformant.java b/stages-tlr/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/models/informants/ArCoTLModelProviderInformant.java
index 42ebe96..228ea96 100644
--- a/stages-tlr/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/models/informants/ArCoTLModelProviderInformant.java
+++ b/stages-tlr/model-provider/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/models/informants/ArCoTLModelProviderInformant.java
@@ -24,7 +24,6 @@ public final class ArCoTLModelProviderInformant extends Informant {
     private final File fromFile;
 
     // Needed for Configuration Generation
-    @SuppressWarnings("unused")
     private ArCoTLModelProviderInformant() {
         super(null, null);
         this.extractor = null;
diff --git a/stages-tlr/text-preprocessing/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/text/providers/informants/corenlp/CoreNLPProvider.java b/stages-tlr/text-preprocessing/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/text/providers/informants/corenlp/CoreNLPProvider.java
index 6de2743..54b7b6d 100644
--- a/stages-tlr/text-preprocessing/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/text/providers/informants/corenlp/CoreNLPProvider.java
+++ b/stages-tlr/text-preprocessing/src/main/java/edu/kit/kastel/mcse/ardoco/tlr/text/providers/informants/corenlp/CoreNLPProvider.java
@@ -15,41 +15,40 @@ public class CoreNLPProvider extends NlpInformant {
     private Text annotatedText;
 
     // Needed for Configuration Generation
-    @SuppressWarnings("unused")
     private CoreNLPProvider() {
         super(CoreNLPProvider.class.getSimpleName(), null);
     }
 
     public CoreNLPProvider(DataRepository data) {
         super(CoreNLPProvider.class.getSimpleName(), data);
-        annotatedText = null;
+        this.annotatedText = null;
     }
 
     @Override
     public void process() {
-        if (!DataRepositoryHelper.hasAnnotatedText(getDataRepository())) {
-            var preprocessingData = new PreprocessingData(getAnnotatedText());
-            DataRepositoryHelper.putPreprocessingData(getDataRepository(), preprocessingData);
+        if (!DataRepositoryHelper.hasAnnotatedText(this.getDataRepository())) {
+            var preprocessingData = new PreprocessingData(this.getAnnotatedText());
+            DataRepositoryHelper.putPreprocessingData(this.getDataRepository(), preprocessingData);
         }
     }
 
     @Override
     public Text getAnnotatedText(String textName) {
-        logger.warn("Returning annotated text ignoring the provided name");
-        return getAnnotatedText();
+        this.logger.warn("Returning annotated text ignoring the provided name");
+        return this.getAnnotatedText();
     }
 
     @Override
     public synchronized Text getAnnotatedText() {
-        if (annotatedText == null) {
-            if (DataRepositoryHelper.hasAnnotatedText(getDataRepository())) {
-                annotatedText = DataRepositoryHelper.getAnnotatedText(getDataRepository());
+        if (this.annotatedText == null) {
+            if (DataRepositoryHelper.hasAnnotatedText(this.getDataRepository())) {
+                this.annotatedText = DataRepositoryHelper.getAnnotatedText(this.getDataRepository());
             } else {
-                String text = DataRepositoryHelper.getInputText(getDataRepository());
-                annotatedText = processText(text);
+                String text = DataRepositoryHelper.getInputText(this.getDataRepository());
+                this.annotatedText = this.processText(text);
             }
         }
-        return annotatedText;
+        return this.annotatedText;
     }
 
     private Text processText(String inputText) {