diff --git a/src/main/java/com/avaje/ebean/DRawSqlParser.java b/src/main/java/com/avaje/ebean/DRawSqlParser.java
index 9aa3586ba..f151edbe1 100644
--- a/src/main/java/com/avaje/ebean/DRawSqlParser.java
+++ b/src/main/java/com/avaje/ebean/DRawSqlParser.java
@@ -107,10 +107,7 @@ class DRawSqlParser {
     if (placeHolderHaving > -1) {
       return true;
     }
-    if (placeHolderAndHaving > -1) {
-      return true;
-    }
-    return false;
+    return placeHolderAndHaving > -1;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java b/src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java
index c5508e6c3..0452b95a3 100644
--- a/src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java
+++ b/src/main/java/com/avaje/ebean/config/AbstractNamingConvention.java
@@ -272,10 +272,7 @@ public abstract class AbstractNamingConvention implements NamingConvention {
    * Checks string is null or empty .
    */
   protected boolean isEmpty(String s) {
-    if (s == null || s.trim().length() == 0) {
-      return true;
-    }
-    return false;
+    return s == null || s.trim().length() == 0;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/config/PropertyExpression.java b/src/main/java/com/avaje/ebean/config/PropertyExpression.java
index 116d92461..3c7bae94f 100644
--- a/src/main/java/com/avaje/ebean/config/PropertyExpression.java
+++ b/src/main/java/com/avaje/ebean/config/PropertyExpression.java
@@ -144,13 +144,7 @@ final class PropertyExpression {
   }
 
   private static boolean isJndiExpression(String exp) {
-    if (exp.startsWith("JNDI:")) {
-      return true;
-    }
-    if (exp.startsWith("jndi:")) {
-      return true;
-    }
-    return false;
+    return exp.startsWith("JNDI:") || exp.startsWith("jndi:");
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebean/util/StringHelper.java b/src/main/java/com/avaje/ebean/util/StringHelper.java
index c8c4e7276..a15db3629 100644
--- a/src/main/java/com/avaje/ebean/util/StringHelper.java
+++ b/src/main/java/com/avaje/ebean/util/StringHelper.java
@@ -155,10 +155,7 @@ public class StringHelper {
    * Return true if the value is null or an empty string.
    */
   public static boolean isNull(String value) {
-    if (value == null || value.trim().length() == 0) {
-      return true;
-    }
-    return false;
+    return value == null || value.trim().length() == 0;
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java b/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java
index ec6f5649b..e009ee18c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/InternalConfiguration.java
@@ -160,11 +160,7 @@ public class InternalConfiguration {
       return true;
     }
     DataSource dataSource = serverConfig.getDataSource();
-    if (dataSource instanceof DataSourcePool && ((DataSourcePool)dataSource).getAutoCommit()) {
-      // We know the DataSourcePool is using autoCommit
-      return true;
-    }
-    return false;
+    return dataSource instanceof DataSourcePool && ((DataSourcePool) dataSource).getAutoCommit();
   }
 
   public JsonContext createJsonContext(SpiEbeanServer server) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/ddl/AddForeignKeysVisitor.java b/src/main/java/com/avaje/ebeaninternal/server/ddl/AddForeignKeysVisitor.java
index a61476e5c..bbb34b40a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/ddl/AddForeignKeysVisitor.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/ddl/AddForeignKeysVisitor.java
@@ -23,11 +23,7 @@ public class AddForeignKeysVisitor extends AbstractBeanVisitor {
 	}
 
   public boolean visitBean(BeanDescriptor<?> descriptor) {
-    if (!descriptor.isInheritanceRoot()) {
-      // ignore/skip if not a top level BeanDescriptor
-      return false;
-    }
-    return true;
+    return descriptor.isInheritanceRoot();
   }
 
   public void visitBeanEnd(BeanDescriptor<?> descriptor) {
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
index ced5d517b..8ce5761f1 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectBuilder.java
@@ -149,11 +149,8 @@ public class DRawSqlSelectBuilder {
 		if (placeHolderHaving > -1) {
 			return true;
 		}
-		if (placeHolderAndHaving > -1) {
-			return true;
-		}
-		return false;
-	}
+    return placeHolderAndHaving > -1;
+  }
 
 	/**
 	 * Trim off the select keyword (to support row_number() limit function).
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
index 10a44e251..7e118b07c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DRawSqlSelectColumnsParser.java
@@ -215,11 +215,8 @@ public final class DRawSqlSelectColumnsParser {
 		if (columnLabel.equalsIgnoreCase(prop.getDbColumn())) {
 			return true;
 		}
-		if (columnLabel.equalsIgnoreCase(prop.getName())) {
-			return true;
-		}
-		return false;
-	}
+    return columnLabel.equalsIgnoreCase(prop.getName());
+  }
 
 	private int nextComma() {
 		boolean inQuote = false;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java
index e4d1bdd6a..a4b974557 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/DeployParser.java
@@ -167,20 +167,10 @@ public abstract class DeployParser {
 		} else if (ch == UNDERSCORE) {
 			return true;
 
-		} else if (ch == PERIOD) {
-			return true;
-
-		} else {
-			return false;
-		}
+		} else return ch == PERIOD;
 	}
 
 	private boolean isWordStart(char ch) {
-		if (Character.isLetter(ch)) {
-			return true;
-
-		} else {
-			return false;
-		}
+    return Character.isLetter(ch);
 	}
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java
index 885e6ce97..588506735 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationBase.java
@@ -32,10 +32,7 @@ public abstract class AnnotationBase {
    * Checks string is null or empty .
    */
   protected boolean isEmpty(String s) {
-    if (s == null || s.trim().length() == 0) {
-      return true;
-    }
-    return false;
+    return s == null || s.trim().length() == 0;
   }
 
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java
index 1b8185d17..f2cf0e0f6 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/lib/util/StringHelper.java
@@ -155,11 +155,8 @@ public class StringHelper {
 	 * Return true if the value is null or an empty string.
 	 */
 	public static boolean isNull(String value) {
-		if (value == null || value.trim().length() == 0) {
-			return true;
-		}
-		return false;
-	}
+    return value == null || value.trim().length() == 0;
+  }
 
 	/**
 	 * Recursively pulls out the key value pairs from a raw string.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
index fd51df206..f5570ea34 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetail.java
@@ -357,10 +357,7 @@ public class OrmQueryDetail implements Serializable {
    * Return true if this is actually the root level of a +query/+lazy loading query.
    */
   private boolean isLazyLoadManyRoot(String lazyLoadManyPath, OrmQueryProperties chunk) {
-    if (lazyLoadManyPath != null && lazyLoadManyPath.equals(chunk.getPath())) {
-      return true;
-    }
-    return false;
+    return lazyLoadManyPath != null && lazyLoadManyPath.equals(chunk.getPath());
   }
 
   /**
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
index b1dfbd5a8..b87752364 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/OrmQueryDetailParser.java
@@ -184,15 +184,6 @@ public class OrmQueryDetailParser {
   }
 
   private boolean isFindFetchEnd() {
-    if (isFetch()) {
-      return true;
-    }
-    if (parser.isMatch("where")) {
-      return true;
-    }
-    if (parser.isMatch("order", "by")) {
-      return true;
-    }
-    return false;
+    return isFetch() || parser.isMatch("where") || parser.isMatch("order", "by");
   }
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java b/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java
index 367cd5238..9cef2cb9a 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/text/csv/TCsvReader.java
@@ -245,11 +245,8 @@ public class TCsvReader<T> implements CsvReader<T> {
 	}
 
 	private boolean isDateTimeType(int t) {
-		if (t == Types.TIMESTAMP || t == Types.DATE || t == Types.TIME) {
-			return true;
-		}
-		return false;
-	}
+    return t == Types.TIMESTAMP || t == Types.DATE || t == Types.TIME;
+  }
 
 	@SuppressWarnings("unchecked")
 	protected T buildBeanFromLineContent(int row, String[] line) {