diff --git a/ebean-api/src/main/java/io/ebean/event/BeanFindController.java b/ebean-api/src/main/java/io/ebean/event/BeanFindController.java
index 4c2799c6c..5190dd063 100644
--- a/ebean-api/src/main/java/io/ebean/event/BeanFindController.java
+++ b/ebean-api/src/main/java/io/ebean/event/BeanFindController.java
@@ -51,14 +51,14 @@ public interface BeanFindController {
   <T> BeanCollection<T> findMany(BeanQueryRequest<T> request);
 
   /**
-   * Allows post processing of the find result.
+   * Allows post-processing of the find result.
    */
   default <T> BeanCollection<T> postProcessMany(BeanQueryRequest<T> request, BeanCollection<T> result) {
     return result;
   }
 
   /**
-   * Allows post processing of the find result.
+   * Allows post-processing of the find result.
    */
   default <T> T postProcess(BeanQueryRequest<T> request, T result) {
     return result;
diff --git a/ebean-core/src/test/java/org/tests/model/controller/FindControllerMain.java b/ebean-core/src/test/java/org/tests/model/controller/FindControllerMain.java
index 524425c6b..bcc21445f 100644
--- a/ebean-core/src/test/java/org/tests/model/controller/FindControllerMain.java
+++ b/ebean-core/src/test/java/org/tests/model/controller/FindControllerMain.java
@@ -4,9 +4,6 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Transient;
 
-/**
- * @author Jonas P&ouml;hler, FOCONIS AG
- */
 @Entity
 public class FindControllerMain {
 
diff --git a/ebean-core/src/test/java/org/tests/model/controller/SoftRefA.java b/ebean-core/src/test/java/org/tests/model/controller/SoftRefA.java
index f8d87d7a0..41a2bd10e 100644
--- a/ebean-core/src/test/java/org/tests/model/controller/SoftRefA.java
+++ b/ebean-core/src/test/java/org/tests/model/controller/SoftRefA.java
@@ -3,9 +3,6 @@ package org.tests.model.controller;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-/**
- * @author Jonas P&ouml;hler, FOCONIS AG
- */
 @Entity
 public class SoftRefA {
 
diff --git a/ebean-core/src/test/java/org/tests/model/controller/SoftRefB.java b/ebean-core/src/test/java/org/tests/model/controller/SoftRefB.java
index d2619d4dc..c7086096e 100644
--- a/ebean-core/src/test/java/org/tests/model/controller/SoftRefB.java
+++ b/ebean-core/src/test/java/org/tests/model/controller/SoftRefB.java
@@ -3,9 +3,6 @@ package org.tests.model.controller;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-/**
- * @author Jonas P&ouml;hler, FOCONIS AG
- */
 @Entity
 public class SoftRefB {
 
diff --git a/ebean-core/src/test/java/org/tests/model/controller/TestBeanFindController.java b/ebean-core/src/test/java/org/tests/model/controller/TestBeanFindController.java
index dde9dab9f..27cbae2a2 100644
--- a/ebean-core/src/test/java/org/tests/model/controller/TestBeanFindController.java
+++ b/ebean-core/src/test/java/org/tests/model/controller/TestBeanFindController.java
@@ -1,8 +1,6 @@
 package org.tests.model.controller;
 
-import io.ebean.DB;
 import io.ebean.bean.BeanCollection;
-import io.ebean.bean.EntityBean;
 import io.ebean.event.BeanFindController;
 import io.ebean.event.BeanQueryRequest;
 import io.ebean.plugin.BeanType;
@@ -12,9 +10,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author Jonas P&ouml;hler, FOCONIS AG
- */
 public class TestBeanFindController implements BeanFindController {
 
   @Override