diff --git a/README.md b/README.md
index 8d7eb1f..80e73da 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@
 
 
 In addition to that a query string may be used to search for entities.
-This query string is evaluatated and processed by a full text search
+This query string is evaluated and processed by a full text search
 which returns a result consisting of Test, TestStep or Measurement
 entities.
 
@@ -79,11 +79,11 @@
 complete, one can pass a listener to track the overall progress.
 
 NOTE:
-<pre>
+```
 This service does not allow manually uploading or deleting files. Instead 
 files are automatically uploaded / deleted while entities are written 
 within a Section 2.5, "Transaction".
-</pre>
+```
 
 ### 2.4. EntityFactory ###
 
@@ -120,12 +120,12 @@
 uploaded files is send on a best effort basis.
 
 IMPORTANT:
-<pre>
+```
 Externally linked files of deleted entities are only removed if the
 entity is an instance of FilesAttachable (Test, TestStep, Measurement).
 In any other case, externally linked files are not removed since this 
 may have an impact on other entities which reference the same file.
-</pre>
+```
 
 Besides the modification of entities, it is possible to write mass data
 by defining write requests. A write request describes in detail how the
@@ -140,7 +140,7 @@
 takes parameters, shown in the example below, to establish a
 connection. On success an entity manager is returned.
 
-
+```java
     Map<String, String> connectionParameters = new HashMap<>();
     connectionParameters.put(ODSEntityManagerFactory.PARAM_NAMESERVICE, "corbaloc::1.2@<SERVER>:<PORT>/NameService");
     connectionParameters.put(ODSEntityManagerFactory.PARAM_SERVICENAME, "<SERVICE>.ASAM-ODS");
@@ -149,6 +149,7 @@
     EntityManager entityManager = new ODSEntityManagerFactory().connect(connectionParameters);
     // do something useful
     entityManager.close();
+```
 
 ## 4. Copyright and License ##
 Copyright (c) 2015-2018 Contributors to the Eclipse Foundation