diff --git a/src/main/java/de/ids_mannheim/korap/plkexport/MatchAggregator.java b/src/main/java/de/ids_mannheim/korap/plkexport/MatchAggregator.java
index 1f324f3..8aa283d 100644
--- a/src/main/java/de/ids_mannheim/korap/plkexport/MatchAggregator.java
+++ b/src/main/java/de/ids_mannheim/korap/plkexport/MatchAggregator.java
@@ -171,7 +171,7 @@
 
 
     /**
-     * Set the source information verbose.
+     * Set the source information verbatim.
      */
     public void setSource (String src) {
         this.src = src;
diff --git a/src/main/java/de/ids_mannheim/korap/plkexport/RtfExporter.java b/src/main/java/de/ids_mannheim/korap/plkexport/RtfExporter.java
index d827627..d9041d7 100644
--- a/src/main/java/de/ids_mannheim/korap/plkexport/RtfExporter.java
+++ b/src/main/java/de/ids_mannheim/korap/plkexport/RtfExporter.java
@@ -146,7 +146,9 @@
 
             w.append("\n");
 
-        } catch (JsonProcessingException jpe) {
+        }
+
+        catch (JsonProcessingException jpe) {
             System.err.println(jpe);
             w.append("{\\pard {\\b Unable to process match} \\par}");
         };
@@ -214,7 +216,7 @@
     
 
     /*
-     * Add information tablerow
+     * Add information table row
      */
     private void addInfoRow (Writer w, String title, String value) throws IOException {
 
diff --git a/src/main/java/de/ids_mannheim/korap/plkexport/Service.java b/src/main/java/de/ids_mannheim/korap/plkexport/Service.java
index 98d12e2..145bf5e 100644
--- a/src/main/java/de/ids_mannheim/korap/plkexport/Service.java
+++ b/src/main/java/de/ids_mannheim/korap/plkexport/Service.java
@@ -59,6 +59,10 @@
 /**
  * TODO:
  * - Rename "is cutted" to "truncated".
+ * - Restructure:
+ *   - Load the exporter objects as part of
+ *     the MatchAggregator instead of full
+ *     inheritance.
  * - Localize RTF export.
  *   - Change "count" to "number of results" in RTF.
  * - Add date info.
@@ -415,7 +419,7 @@
      *            Number of matches to fetch
      */
     @GET
-	@Path("export")
+    @Path("export")
     @Produces(SseFeature.SERVER_SENT_EVENTS)
     @Consumes(SseFeature.SERVER_SENT_EVENTS)
 	public Response progressExport(
diff --git a/src/main/java/de/ids_mannheim/korap/plkexport/Snippet.java b/src/main/java/de/ids_mannheim/korap/plkexport/Snippet.java
index a5f2ef0..8422f8c 100644
--- a/src/main/java/de/ids_mannheim/korap/plkexport/Snippet.java
+++ b/src/main/java/de/ids_mannheim/korap/plkexport/Snippet.java
@@ -32,7 +32,6 @@
     public Snippet (String snippetstr) {
 
         // Match with precise algorithm
-        String left, right;
         Matcher m = snippetP.matcher(snippetstr);
         if (m.find()) {
             left = m.group(1);