--- a/backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java	Tue Apr 03 10:37:30 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/BedHeightValue.java	Tue Apr 03 10:40:57 2018 +0200
@@ -8,26 +8,23 @@
 
 package org.dive4elements.river.model;
 
+import java.io.Serializable;
 import java.util.List;
 
-import java.io.Serializable;
-
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Column;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.GenerationType;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
 
 import org.apache.log4j.Logger;
-
+import org.dive4elements.river.backend.SessionHolder;
+import org.hibernate.Query;
 import org.hibernate.Session;
-import org.hibernate.Query;
-
-import org.dive4elements.river.backend.SessionHolder;
 
 
 @Entity
@@ -36,7 +33,7 @@
 implements   Serializable
 {
     private static Logger log =
-        Logger.getLogger(BedHeightValue.class);
+            Logger.getLogger(BedHeightValue.class);
 
     private Integer id;
 
@@ -151,34 +148,21 @@
         this.maxHeight = maxHeight;
     }
 
-
-    public static List<BedHeightValue> getBedHeightValues(
-        BedHeight single) {
-        Session session = SessionHolder.HOLDER.get();
-
-        Query query = session.createQuery(
-            "from BedHeightValue where bedHeight=:single");
-
+    public static List<BedHeightValue> getBedHeightValues(final BedHeight single) {
+        final Session session = SessionHolder.HOLDER.get();
+        final Query query = session.createQuery("FROM BedHeightValue WHERE bedHeight=:single");
         query.setParameter("single", single);
         return query.list();
     }
 
 
-    public static List<BedHeightValue> getBedHeightValues(
-        BedHeight single,
-        double kmLo,
-        double kmHi
-    ) {
-        Session session = SessionHolder.HOLDER.get();
-
-        Query query = session.createQuery(
-            "from BedHeightValue where bedHeight=:single " +
-            "   and station >= :kmLo and station <= :kmHi");
-
+    public static List<BedHeightValue> getBedHeightValues(final BedHeight single, final double kmLo, final double kmHi) {
+        final Session session = SessionHolder.HOLDER.get();
+        final Query query = session.createQuery("FROM BedHeightValue WHERE (bedHeight=:single)"
+                + " AND (station >= :kmLo) AND (station <= :kmHi)");
         query.setParameter("single", single);
         query.setParameter("kmLo", new Double(kmLo));
         query.setParameter("kmHi", new Double(kmHi));
-
         return query.list();
     }
 }