diff --git a/pages/docs/using.md b/pages/docs/using.md
index 43df0732a347ab3a398343dd03f876f063158147..526ce6f2757b50b404ab6f4743f916fb4ce7edcd 100644
--- a/pages/docs/using.md
+++ b/pages/docs/using.md
@@ -5,9 +5,9 @@ The full example is available at <https://git-st.inf.tu-dresden.de/jastadd/ragco
 ## Preparation
 
 The following examples are inspired by the real test case [read1write2](https://git-st.inf.tu-dresden.de/jastadd/ragconnect-tests/-/tree/master/ragconnect.tests/src/test/01-input/read1write2)
-The idea is to have two nonterminals, where input information is received on one of them, and - after transformation - is sent out by both.
+The idea is to have two non-terminals, where input information is received on one of them, and - after transformation - is sent out by both.
 
-Let the following grammar be used:
+Let's use the following grammar:
 
 ```bnf
 A ::= <Input:String> /<OutputOnA:String>/ B* ;
@@ -92,7 +92,7 @@ b1.connectOutputOnB("mqtt://localhost/b1/out", true);
 b2.connectOutputOnB("mqtt://localhost/b2/out", false);
 ```
 
-The first parameter of those connect-methods is always an URI-like String, to identify the protocol to use, the server operating the protocol, and a path to identify the concrete token.
+The first parameter of those connect-methods is always a URI-like String, to identify the protocol to use, the server operating the protocol, and a path to identify the concrete token.
 In case of MQTT, the server is the host running an MQTT broker, and the path is equal to the topic to publish or subscribe to.
 Please note, that the first leading slash (`/`) is removed for MQTT topics, e.g., for `A.Input` the topic is actually `topic/for/input`.
 
diff --git a/ragconnect.base/src/main/jastadd/intermediate/Mappings.jrag b/ragconnect.base/src/main/jastadd/intermediate/Mappings.jrag
index 99824ff53c40ce77b643358949cff2b6b386bed7..9d122978ee65307972063cb33e111e951b979569 100644
--- a/ragconnect.base/src/main/jastadd/intermediate/Mappings.jrag
+++ b/ragconnect.base/src/main/jastadd/intermediate/Mappings.jrag
@@ -145,7 +145,7 @@ aspect Mappings {
       // if no mappings are specified, or if first mapping is not suitable.
       // then prepend the suitable default mapping
       if (getMappingList().isEmpty() || !getMappingList().get(0).getFromType().isByteArray()) {
-        result = new java.util.ArrayList();
+        result = new java.util.ArrayList<>();
         result.add(suitableReceiveDefaultMapping());
         result.addAll(getMappingList());
       } else {
@@ -155,7 +155,7 @@ aspect Mappings {
       // if no mappings are specified, or if last mapping is not suitable
       // then append the suitable default mapping
       if (getMappingList().isEmpty() || !getMappingList().get(getMappingList().size() - 1).getToType().isByteArray()) {
-        result = new java.util.ArrayList(getMappingList());
+        result = new java.util.ArrayList<>(getMappingList());
         result.add(suitableSendDefaultMapping());
       } else {
         result = getMappingList();