diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/AbstractDateRange.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/AbstractDateRange.java
index ca6c1ae..d2bd804 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/AbstractDateRange.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/AbstractDateRange.java
@@ -23,7 +23,6 @@
 
 /**
  * Basic implementation of {@link DateRange}
- * @author AB
  *
  * @param <SELF> implementer
  */
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeActions.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeActions.java
index 95e7d48..b8627df 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeActions.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeActions.java
@@ -19,8 +19,6 @@
 
 /**
  * Actions which can be done with a {@link DateRangeModel}
- * 
- * @author AB
  *
  * @param <D> DateRange
  * @param <T> Implementer; returned as "Builder"
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeModel.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeModel.java
index 1fc5124..80af2f9 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeModel.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeModel.java
@@ -22,9 +22,6 @@
 
 /**
  * Model for {@link DateRangePicker}
- * 
- * @author AB
- *
  */
 public class DateRangeModel<D extends DateRange> implements DateRangeActions<D, DateRangeModel<D>>
 {
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeResult.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeResult.java
index 3a0c7e7..f176358 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeResult.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/DateRangeResult.java
@@ -19,8 +19,6 @@
 
 /**
  * Result of a {@link DateRange} calculation
- * @author AB
- *
  */
 public interface DateRangeResult
 {
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRange.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRange.java
index ed9a77b..072c690 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRange.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRange.java
@@ -17,9 +17,6 @@
 
 /**
  * Simple implementation if {@link AbstractDateRange}
- * 
- * @author AB
- *
  */
 public class SimpleDateRange extends AbstractDateRange<SimpleDateRange>
 {
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRangeResult.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRangeResult.java
index 3c20db4..521e263 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRangeResult.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRangeResult.java
@@ -19,9 +19,6 @@
 
 /**
  * Simple implementation of {@link DateRangeResult}
- * 
- * @author AB
- *
  */
 public class SimpleDateRangeResult implements DateRangeResult
 {
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRanges.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRanges.java
index e7e1764..39c0c87 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRanges.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/SimpleDateRanges.java
@@ -22,16 +22,12 @@
 
 /**
  * Contains predefined {@link SimpleDateRange SimpleDateRanges}
- * 
- * @author AB
- *
  */
 @SuppressWarnings("checkstyle:MagicNumber")
 public final class SimpleDateRanges
 {
 	private SimpleDateRanges()
 	{
-		// No Impls
 	}
 	
 	public static final SimpleDateRange TODAY = new SimpleDateRange()
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java
index c2832d6..01b3672 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java
@@ -52,11 +52,8 @@
 
 /**
  * Represents a Date-Range-Picker
- * 
- * @author AB
- *
  */
-@SuppressWarnings("PMD.GodClass")
+@SuppressWarnings({"PMD.GodClass", "java:S1948"})
 @CssImport(DateRangePickerStyles.LOCATION)
 public class DateRangePicker<D extends DateRange> extends Composite<VerticalLayout> implements
 	FlexComponent,
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java
index 0b6c510..34327d6 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java
@@ -45,10 +45,8 @@
 
 /**
  * Overlay of the expanded {@link DateRangePicker}
- * 
- * @author AB
- *
  */
+@SuppressWarnings("java:S1948")
 @CssImport(DateRangePickerStyles.LOCATION)
 public class DateRangePickerOverlay<D extends DateRange> extends Composite<VerticalLayout> implements
 	HasItems<D>,
diff --git a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerStyles.java b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerStyles.java
index 4386b3d..e7d3093 100644
--- a/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerStyles.java
+++ b/vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerStyles.java
@@ -17,9 +17,6 @@
 
 /**
  * Styles for the {@link DateRangePicker}
- * 
- * @author AB
- *
  */
 public final class DateRangePickerStyles
 {