diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VJournalAddValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VJournalAddValidator.java
index b8dc39694..cdb520dd9 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VJournalAddValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VJournalAddValidator.java
@@ -63,7 +63,7 @@ public void validate(final VJournal target) throws ValidationException {
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.LAST_MODIFIED,
                 Property.STATUS, Property.SUMMARY, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.ATTENDEE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.RECURRENCE_ID, target.getProperties());
+        Arrays.asList(Property.ATTENDEE, Property.RECURRENCE_ID).forEach(
+                property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VJournalCancelValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VJournalCancelValidator.java
index 8223c3962..1dd76e539 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VJournalCancelValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VJournalCancelValidator.java
@@ -60,10 +60,8 @@ public class VJournalCancelValidator implements Validator<VJournal> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VJournal target) throws ValidationException {
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SEQUENCE, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.SEQUENCE, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
                 Property.DTSTART, Property.LAST_MODIFIED, Property.RECURRENCE_ID, Property.STATUS, Property.SUMMARY,
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VJournalPublishValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VJournalPublishValidator.java
index 13ca25b9e..5ac0d14a7 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VJournalPublishValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VJournalPublishValidator.java
@@ -61,11 +61,8 @@ public class VJournalPublishValidator implements Validator<VJournal> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VJournal target) throws ValidationException {
-        PropertyValidator.getInstance().assertOne(Property.DESCRIPTION, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.DTSTART, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DESCRIPTION, Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.LAST_MODIFIED,
                 Property.RECURRENCE_ID, Property.SEQUENCE, Property.STATUS, Property.SUMMARY, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneITIPValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneITIPValidator.java
index e544226d2..0cac5111a 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneITIPValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneITIPValidator.java
@@ -7,6 +7,8 @@
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 
+import java.util.Arrays;
+
 /**
  * Common validation for all iTIP methods.
  *
@@ -51,9 +53,8 @@ public class VTimeZoneITIPValidator implements Validator<VTimeZone> {
      */
     public void validate(VTimeZone target) throws ValidationException {
         for (final Observance observance : target.getObservances()) {
-            PropertyValidator.getInstance().assertOne(Property.DTSTART, observance.getProperties());
-            PropertyValidator.getInstance().assertOne(Property.TZOFFSETFROM, observance.getProperties());
-            PropertyValidator.getInstance().assertOne(Property.TZOFFSETTO, observance.getProperties());
+            Arrays.asList(Property.DTSTART, Property.TZOFFSETFROM, Property.TZOFFSETTO).forEach(
+                    property -> PropertyValidator.getInstance().assertOne(property, observance.getProperties()));
 
             PropertyValidator.getInstance().assertOneOrLess(Property.TZNAME, observance.getProperties());
         }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoAddValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoAddValidator.java
index 793e15398..8d6f14fd0 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoAddValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoAddValidator.java
@@ -70,19 +70,15 @@ public class VToDoAddValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.PRIORITY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SEQUENCE, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SUMMARY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.PRIORITY, Property.SEQUENCE, Property.SUMMARY, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
                 Property.DTSTART, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
                 Property.PERCENT_COMPLETE, Property.RESOURCES, Property.STATUS, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.RECURRENCE_ID, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        Arrays.asList(Property.RECURRENCE_ID, Property.REQUEST_STATUS).forEach(
+                property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.ADD);
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoCancelValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoCancelValidator.java
index 00ee55ef3..38ed40dff 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoCancelValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoCancelValidator.java
@@ -73,10 +73,8 @@ public class VToDoCancelValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SEQUENCE, target.getProperties());
+        Arrays.asList(Property.UID, Property.DTSTAMP, Property.ORGANIZER, Property.SEQUENCE).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
                 Property.DTSTART, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoCounterValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoCounterValidator.java
index 6316474f1..ac221599c 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoCounterValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoCounterValidator.java
@@ -73,11 +73,8 @@ public class VToDoCounterValidator implements Validator<VToDo> {
     public void validate(final VToDo target) throws ValidationException {
         PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
 
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.PRIORITY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SUMMARY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.PRIORITY, Property.SUMMARY, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
                 Property.DTSTART, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoDeclineCounterValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoDeclineCounterValidator.java
index 91be15e06..8767ed26e 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoDeclineCounterValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoDeclineCounterValidator.java
@@ -69,10 +69,8 @@ public class VToDoDeclineCounterValidator implements Validator<VToDo> {
     public void validate(final VToDo target) throws ValidationException {
         PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
 
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SEQUENCE, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.SEQUENCE, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
                 Property.DTSTART, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoPublishValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoPublishValidator.java
index 334e0829c..233688ae3 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoPublishValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoPublishValidator.java
@@ -76,12 +76,12 @@ public void validate(final VToDo target) throws ValidationException {
         PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
 
         if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) {
-            PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-            PropertyValidator.getInstance().assertOne(Property.PRIORITY, target.getProperties());
+            Arrays.asList(Property.ORGANIZER, Property.PRIORITY).forEach(
+                    property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
         }
 
-        PropertyValidator.getInstance().assertOne(Property.SUMMARY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.SUMMARY, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         // DTSTART: RFC2446 conflicts with RCF2445..
         Arrays.asList(Property.DTSTART, Property.SEQUENCE, Property.CATEGORIES, Property.CLASS,
@@ -89,8 +89,8 @@ public void validate(final VToDo target) throws ValidationException {
                 Property.LOCATION, Property.PERCENT_COMPLETE, Property.RECURRENCE_ID, Property.RESOURCES, Property.STATUS,
                 Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.ATTENDEE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        Arrays.asList(Property.ATTENDEE, Property.REQUEST_STATUS).forEach(
+                property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.PUBLISH);
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoRefreshValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoRefreshValidator.java
index 90d65bbab..2fa01c793 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoRefreshValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoRefreshValidator.java
@@ -8,6 +8,8 @@
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 
+import java.util.Arrays;
+
 /**
  * <pre>
  * Component/Property   Presence
@@ -64,37 +66,17 @@ public class VToDoRefreshValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOne(Property.ATTENDEE, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.ATTENDEE, Property.DTSTAMP, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         PropertyValidator.getInstance().assertOneOrLess(Property.RECURRENCE_ID, target.getProperties());
 
-        PropertyValidator.getInstance().assertNone(Property.ATTACH, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.CATEGORIES, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.CLASS, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.CONTACT, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.CREATED, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.DESCRIPTION, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.DTSTART, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.DUE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.DURATION, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.EXDATE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.EXRULE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.GEO, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.LAST_MODIFIED, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.LOCATION, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.PERCENT_COMPLETE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.PRIORITY, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.RDATE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.RELATED_TO, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.RESOURCES, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.RRULE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.SEQUENCE, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.STATUS, target.getProperties());
-        PropertyValidator.getInstance().assertNone(Property.URL, target.getProperties());
+        Arrays.asList(Property.ATTACH, Property.CATEGORIES, Property.CLASS, Property.CONTACT, Property.CREATED,
+                Property.DESCRIPTION, Property.DTSTART, Property.DUE, Property.DURATION, Property.EXDATE, Property.EXRULE,
+                Property.GEO, Property.LAST_MODIFIED, Property.LOCATION, Property.ORGANIZER, Property.PERCENT_COMPLETE,
+                Property.PRIORITY, Property.RDATE, Property.RELATED_TO, Property.REQUEST_STATUS, Property.RESOURCES,
+                Property.RRULE, Property.SEQUENCE, Property.STATUS, Property.URL).forEach(
+                        property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
 
         ComponentValidator.assertNone(Component.VALARM, target.getAlarms());
     }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoReplyValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoReplyValidator.java
index d8a1594eb..2790b5058 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoReplyValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoReplyValidator.java
@@ -71,9 +71,8 @@ public class VToDoReplyValidator implements Validator<VToDo> {
     public void validate(final VToDo target) throws ValidationException {
         PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
 
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
                 Property.DTSTART, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VToDoRequestValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VToDoRequestValidator.java
index 642d31482..65ed3a903 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoRequestValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoRequestValidator.java
@@ -76,12 +76,8 @@ public class VToDoRequestValidator implements Validator<VToDo> {
     public void validate(final VToDo target) throws ValidationException {
         PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
 
-        PropertyValidator.getInstance().assertOne(Property.DTSTAMP, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.DTSTART, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.PRIORITY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.SUMMARY, target.getProperties());
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        Arrays.asList(Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.PRIORITY, Property.SUMMARY, Property.UID).forEach(
+                property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         Arrays.asList(Property.SEQUENCE, Property.CATEGORIES, Property.CLASS, Property.CREATED,
                 Property.DESCRIPTION, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,