diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmAudioValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmAudioValidator.java
index b86d5cbf8..8702de56a 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmAudioValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmAudioValidator.java
@@ -1,11 +1,12 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 
+import static net.fortuna.ical4j.model.Property.ATTACH;
+
 /**
  * Created by fortuna on 12/09/15.
  */
@@ -20,6 +21,6 @@ public void validate(VAlarm target) throws ValidationException {
         /*
          * ; the following is optional, ; but MUST NOT occur more than once attach /
          */
-        PropertyValidator.getInstance().assertOneOrLess(Property.ATTACH, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrLess(ATTACH, target.getProperties());
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmDisplayValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmDisplayValidator.java
index 56c427e03..7188afa1b 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmDisplayValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmDisplayValidator.java
@@ -1,11 +1,12 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 
+import static net.fortuna.ical4j.model.Property.DESCRIPTION;
+
 /**
  * Created by fortuna on 12/09/15.
  */
@@ -20,6 +21,6 @@ public void validate(VAlarm target) throws ValidationException {
         /*
          * ; the following are all REQUIRED, ; but MUST NOT occur more than once action / description / trigger /
          */
-        PropertyValidator.getInstance().assertOne(Property.DESCRIPTION, target.getProperties());
+        PropertyValidator.getInstance().assertOne(DESCRIPTION, target.getProperties());
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmEmailValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmEmailValidator.java
index 7f89e28e2..33f98a22d 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmEmailValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmEmailValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * Created by fortuna on 12/09/15.
  */
@@ -30,8 +31,8 @@ public void validate(final VAlarm target) throws ValidationException {
          * ; the following are optional,
          * ; and MAY occur more than once attach / x-prop
          */
-        Arrays.asList(Property.DESCRIPTION, Property.SUMMARY).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DESCRIPTION, SUMMARY).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmITIPValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmITIPValidator.java
index 787c97e75..a43e09121 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmITIPValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmITIPValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * Common validation for all iTIP methods.
  *
@@ -33,8 +34,8 @@ public class VAlarmITIPValidator implements Validator<VAlarm> {
      * {@inheritDoc}
      */
     public void validate(final VAlarm target) throws ValidationException {
-        Arrays.asList(Property.ACTION, Property.TRIGGER).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(ACTION, TRIGGER).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.DESCRIPTION, Property.DURATION, Property.REPEAT, Property.SUMMARY).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(DESCRIPTION, DURATION, REPEAT, SUMMARY).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmProcedureValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmProcedureValidator.java
index 7938eb623..856270863 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VAlarmProcedureValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VAlarmProcedureValidator.java
@@ -1,11 +1,13 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
 import net.fortuna.ical4j.validate.Validator;
 
+import static net.fortuna.ical4j.model.Property.ATTACH;
+import static net.fortuna.ical4j.model.Property.DESCRIPTION;
+
 /**
  * Created by fortuna on 12/09/15.
  */
@@ -27,8 +29,8 @@ public void validate(VAlarm target) throws ValidationException {
          * ; and MUST NOT occur more than once description /
          * ; the following is optional, ; and MAY occur more than once x-prop
          */
-        PropertyValidator.getInstance().assertOne(Property.ATTACH, target.getProperties());
+        PropertyValidator.getInstance().assertOne(ATTACH, target.getProperties());
 
-        PropertyValidator.getInstance().assertOneOrLess(Property.DESCRIPTION, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrLess(DESCRIPTION, target.getProperties());
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VEventAddValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventAddValidator.java
index fad42f439..90f8aabaf 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventAddValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventAddValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.property.Method;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:ADD Validator.
  *
@@ -69,14 +70,14 @@ public class VEventAddValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.SEQUENCE,
-                Property.SUMMARY, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, DTSTART, ORGANIZER, SEQUENCE,
+                SUMMARY, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
-                Property.DTEND, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION, Property.PRIORITY,
-                Property.RESOURCES, Property.STATUS, Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTEND, DURATION, GEO, LAST_MODIFIED, LOCATION, PRIORITY,
+                RESOURCES, STATUS, TRANSP, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        Arrays.asList(Property.RECURRENCE_ID, Property.REQUEST_STATUS).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
+        Arrays.asList(RECURRENCE_ID, 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/VEventCancelValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventCancelValidator.java
index fcbe4b8e2..bdc0c4033 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventCancelValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventCancelValidator.java
@@ -1,7 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +8,9 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Component.VALARM;
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:CANCEL Validator.
  *
@@ -75,16 +76,16 @@ public class VEventCancelValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public final void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.SEQUENCE,
-                Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, DTSTART, ORGANIZER, SEQUENCE,
+                UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
-                Property.DTEND, Property.DTSTART, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
-                Property.PRIORITY, Property.RECURRENCE_ID, Property.RESOURCES, Property.STATUS, Property.SUMMARY,
-                Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTEND, DTSTART, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PRIORITY, RECURRENCE_ID, RESOURCES, STATUS, SUMMARY,
+                TRANSP, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        PropertyValidator.getInstance().assertNone(REQUEST_STATUS, target.getProperties());
 
-        ComponentValidator.assertNone(Component.VALARM, target.getAlarms());
+        ComponentValidator.assertNone(VALARM, target.getAlarms());
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VEventCounterValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventCounterValidator.java
index ab6a91471..2aee6c21f 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventCounterValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventCounterValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.property.Method;
@@ -11,6 +10,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:COUNTER Validator.
  *
@@ -77,17 +78,17 @@ public class VEventCounterValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, DTSTART).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) {
-            PropertyValidator.getInstance().assertOne(Property.ORGANIZER, target.getProperties());
+            PropertyValidator.getInstance().assertOne(ORGANIZER, target.getProperties());
         }
 
-        Arrays.asList(Property.SEQUENCE, Property.SUMMARY, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(SEQUENCE, SUMMARY, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.CATEGORIES, Property.CLASS, Property.CREATED, Property.DESCRIPTION,
-                Property.DTEND, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION, Property.PRIORITY,
-                Property.RECURRENCE_ID, Property.RESOURCES, Property.STATUS, Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTEND, DURATION, GEO, LAST_MODIFIED, LOCATION, PRIORITY,
+                RECURRENCE_ID, RESOURCES, STATUS, TRANSP, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.COUNTER);
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VEventDeclineCounterValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventDeclineCounterValidator.java
index 9fde92a9f..728f40e7f 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventDeclineCounterValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventDeclineCounterValidator.java
@@ -1,7 +1,6 @@
 package net.fortuna.ical4j.validate.component;
 
 import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:DECLINECOUNTER Validator.
  *
@@ -70,15 +71,15 @@ public class VEventDeclineCounterValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, ORGANIZER, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.RECURRENCE_ID, Property.SEQUENCE).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(RECURRENCE_ID, SEQUENCE).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        Arrays.asList(Property.ATTACH, Property.ATTENDEE, Property.CATEGORIES, Property.CLASS,
-                Property.CONTACT, Property.CREATED, Property.DESCRIPTION, Property.DTEND, Property.DTSTART, Property.DURATION,
-                Property.EXDATE, Property.EXRULE, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION, Property.PRIORITY,
-                Property.RDATE, Property.RELATED_TO, Property.RESOURCES, Property.RRULE, Property.STATUS, Property.SUMMARY,
-                Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
+        Arrays.asList(ATTACH, ATTENDEE, CATEGORIES, CLASS,
+                CONTACT, CREATED, DESCRIPTION, DTEND, DTSTART, DURATION,
+                EXDATE, EXRULE, GEO, LAST_MODIFIED, LOCATION, PRIORITY,
+                RDATE, RELATED_TO, RESOURCES, RRULE, STATUS, SUMMARY,
+                TRANSP, 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/VEventPublishValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventPublishValidator.java
index df2066dea..071247970 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventPublishValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventPublishValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.property.Method;
@@ -11,6 +10,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:PUBLISH Validator.
  *
@@ -89,23 +90,23 @@ public class VEventPublishValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, DTSTART).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) {
-            Arrays.asList(Property.ORGANIZER, Property.SUMMARY).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+            Arrays.asList(ORGANIZER, SUMMARY).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
         }
 
-        PropertyValidator.getInstance().assertOne(Property.UID, target.getProperties());
+        PropertyValidator.getInstance().assertOne(UID, target.getProperties());
 
-        Arrays.asList(Property.RECURRENCE_ID, Property.SEQUENCE, Property.CATEGORIES, Property.CLASS,
-                Property.CREATED, Property.DESCRIPTION, Property.DTEND, Property.DURATION, Property.GEO, Property.LAST_MODIFIED,
-                Property.LOCATION, Property.PRIORITY, Property.RESOURCES, Property.STATUS, Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(RECURRENCE_ID, SEQUENCE, CATEGORIES, CLASS,
+                CREATED, DESCRIPTION, DTEND, DURATION, GEO, LAST_MODIFIED,
+                LOCATION, PRIORITY, RESOURCES, STATUS, TRANSP, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
         if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) {
-            PropertyValidator.getInstance().assertNone(Property.ATTENDEE, target.getProperties());
+            PropertyValidator.getInstance().assertNone(ATTENDEE, target.getProperties());
         }
 
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        PropertyValidator.getInstance().assertNone(REQUEST_STATUS, target.getProperties());
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.PUBLISH);
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VEventRefreshValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventRefreshValidator.java
index 813564f9b..3cb1d4f93 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventRefreshValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventRefreshValidator.java
@@ -1,7 +1,6 @@
 package net.fortuna.ical4j.validate.component;
 
 import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:REFRESH Validator.
  *
@@ -71,15 +72,15 @@ public class VEventRefreshValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.ATTENDEE, Property.DTSTAMP, Property.ORGANIZER, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(ATTENDEE, DTSTAMP, ORGANIZER, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertOneOrLess(Property.RECURRENCE_ID, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrLess(RECURRENCE_ID, target.getProperties());
 
-        Arrays.asList(Property.ATTACH, Property.CATEGORIES, Property.CLASS, Property.CONTACT,
-                Property.CREATED, Property.DESCRIPTION, Property.DTEND, Property.DTSTART, Property.DURATION, Property.EXDATE,
-                Property.EXRULE, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION, Property.PRIORITY, Property.RDATE,
-                Property.RELATED_TO, Property.REQUEST_STATUS, Property.RESOURCES, Property.RRULE, Property.SEQUENCE,
-                Property.STATUS, Property.SUMMARY, Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
+        Arrays.asList(ATTACH, CATEGORIES, CLASS, CONTACT,
+                CREATED, DESCRIPTION, DTEND, DTSTART, DURATION, EXDATE,
+                EXRULE, GEO, LAST_MODIFIED, LOCATION, PRIORITY, RDATE,
+                RELATED_TO, REQUEST_STATUS, RESOURCES, RRULE, SEQUENCE,
+                STATUS, SUMMARY, TRANSP, 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/VEventReplyValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventReplyValidator.java
index d88a28c32..d80493bbb 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventReplyValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventReplyValidator.java
@@ -1,7 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +8,9 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Component.VALARM;
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:REPLY Validator.
  *
@@ -74,13 +75,13 @@ public class VEventReplyValidator implements Validator<VEvent> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VEvent target) throws ValidationException {
-        Arrays.asList(Property.ATTENDEE, Property.DTSTAMP, Property.ORGANIZER, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(ATTENDEE, DTSTAMP, ORGANIZER, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.RECURRENCE_ID, Property.SEQUENCE, Property.CATEGORIES, Property.CLASS,
-                Property.CREATED, Property.DESCRIPTION, Property.DTEND, Property.DTSTART, Property.DURATION, Property.GEO,
-                Property.LAST_MODIFIED, Property.LOCATION, Property.PRIORITY, Property.RESOURCES, Property.STATUS, Property.SUMMARY,
-                Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(RECURRENCE_ID, SEQUENCE, CATEGORIES, CLASS,
+                CREATED, DESCRIPTION, DTEND, DTSTART, DURATION, GEO,
+                LAST_MODIFIED, LOCATION, PRIORITY, RESOURCES, STATUS, SUMMARY,
+                TRANSP, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        ComponentValidator.assertNone(Component.VALARM, target.getAlarms());
+        ComponentValidator.assertNone(VALARM, target.getAlarms());
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VEventRequestValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VEventRequestValidator.java
index 1466077c1..e96922f8c 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VEventRequestValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VEventRequestValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.property.Method;
@@ -11,6 +10,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:REQUEST Validator.
  *
@@ -72,15 +73,15 @@ public class VEventRequestValidator implements Validator<VEvent> {
 
     public void validate(final VEvent target) throws ValidationException {
         if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) {
-            PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+            PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
         }
 
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.SUMMARY,
-                Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, DTSTART, ORGANIZER, SUMMARY,
+                UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.SEQUENCE, Property.CATEGORIES, Property.CLASS, Property.CREATED,
-                Property.DESCRIPTION, Property.DTEND, Property.DURATION, Property.GEO, Property.LAST_MODIFIED, Property.LOCATION,
-                Property.PRIORITY, Property.RECURRENCE_ID, Property.RESOURCES, Property.STATUS, Property.TRANSP, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(SEQUENCE, CATEGORIES, CLASS, CREATED,
+                DESCRIPTION, DTEND, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PRIORITY, RECURRENCE_ID, RESOURCES, STATUS, TRANSP, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.REQUEST);
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyPublishValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyPublishValidator.java
index 37d6c062e..2a80ee45b 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyPublishValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyPublishValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VFreeBusy;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -48,13 +49,13 @@ public class VFreeBusyPublishValidator implements Validator<VFreeBusy> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VFreeBusy target) throws ValidationException {
-        PropertyValidator.getInstance().assertOneOrMore(Property.FREEBUSY, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(FREEBUSY, target.getProperties());
 
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART, Property.DTEND, Property.ORGANIZER,
-                Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTSTAMP, DTSTART, DTEND, ORGANIZER,
+                UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertOneOrLess(Property.URL, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrLess(URL, target.getProperties());
 
-        Arrays.asList(Property.ATTENDEE, Property.DURATION, Property.REQUEST_STATUS).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
+        Arrays.asList(ATTENDEE, DURATION, REQUEST_STATUS).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyReplyValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyReplyValidator.java
index f1f958b01..52110c785 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyReplyValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyReplyValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VFreeBusy;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -51,11 +52,11 @@ public void validate(final VFreeBusy target) throws ValidationException {
 
         // FREEBUSY is 1+ in RFC2446 but 0+ in Calsify
 
-        Arrays.asList(Property.ATTENDEE, Property.DTSTAMP, Property.DTEND, Property.DTSTART,
-                Property.ORGANIZER, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(ATTENDEE, DTSTAMP, DTEND, DTSTART,
+                ORGANIZER, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertOneOrLess(Property.URL, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrLess(URL, target.getProperties());
 
-        Arrays.asList(Property.DURATION, Property.SEQUENCE).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
+        Arrays.asList(DURATION, SEQUENCE).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
     }
 }
diff --git a/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyRequestValidator.java b/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyRequestValidator.java
index 1bc9dd42a..5b43a4b81 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyRequestValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VFreeBusyRequestValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VFreeBusy;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * METHOD:REQUEST Validator.
  *
@@ -46,12 +47,12 @@ public class VFreeBusyRequestValidator implements Validator<VFreeBusy> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VFreeBusy target) throws ValidationException {
-        PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
 
-        Arrays.asList(Property.DTEND, Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER,
-                Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DTEND, DTSTAMP, DTSTART, ORGANIZER,
+                UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        Arrays.asList(Property.FREEBUSY, Property.DURATION, Property.REQUEST_STATUS,
-                Property.URL).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
+        Arrays.asList(FREEBUSY, DURATION, REQUEST_STATUS,
+                URL).forEach(property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
     }
 }
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 cdb520dd9..a93595c0f 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VJournalAddValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VJournalAddValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VJournal;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -57,13 +58,13 @@ public class VJournalAddValidator implements Validator<VJournal> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VJournal target) throws ValidationException {
-        Arrays.asList(Property.DESCRIPTION, Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER,
-                Property.SEQUENCE, Property.UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
+        Arrays.asList(DESCRIPTION, DTSTAMP, DTSTART, ORGANIZER,
+                SEQUENCE, UID).forEach(property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        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()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, LAST_MODIFIED,
+                STATUS, SUMMARY, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        Arrays.asList(Property.ATTENDEE, Property.RECURRENCE_ID).forEach(
+        Arrays.asList(ATTENDEE, 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 1dd76e539..017c6ac1f 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VJournalCancelValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VJournalCancelValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VJournal;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property   Presence
@@ -60,13 +61,13 @@ public class VJournalCancelValidator implements Validator<VJournal> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VJournal target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.SEQUENCE, Property.UID).forEach(
+        Arrays.asList(DTSTAMP, ORGANIZER, SEQUENCE, 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,
-                Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTSTART, LAST_MODIFIED, RECURRENCE_ID, STATUS, SUMMARY,
+                URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        PropertyValidator.getInstance().assertNone(REQUEST_STATUS, target.getProperties());
     }
 }
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 5ac0d14a7..404115270 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VJournalPublishValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VJournalPublishValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VJournal;
 import net.fortuna.ical4j.validate.PropertyValidator;
 import net.fortuna.ical4j.validate.ValidationException;
@@ -8,6 +7,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -61,12 +62,12 @@ public class VJournalPublishValidator implements Validator<VJournal> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VJournal target) throws ValidationException {
-        Arrays.asList(Property.DESCRIPTION, Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.UID).forEach(
+        Arrays.asList(DESCRIPTION, DTSTAMP, DTSTART, ORGANIZER, 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()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, LAST_MODIFIED,
+                RECURRENCE_ID, SEQUENCE, STATUS, SUMMARY, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertNone(ATTENDEE, 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 0cac5111a..3b0815bb2 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneITIPValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VTimeZoneITIPValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.Observance;
 import net.fortuna.ical4j.model.component.VTimeZone;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -9,6 +8,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * Common validation for all iTIP methods.
  *
@@ -53,10 +54,10 @@ public class VTimeZoneITIPValidator implements Validator<VTimeZone> {
      */
     public void validate(VTimeZone target) throws ValidationException {
         for (final Observance observance : target.getObservances()) {
-            Arrays.asList(Property.DTSTART, Property.TZOFFSETFROM, Property.TZOFFSETTO).forEach(
+            Arrays.asList(DTSTART, TZOFFSETFROM, TZOFFSETTO).forEach(
                     property -> PropertyValidator.getInstance().assertOne(property, observance.getProperties()));
 
-            PropertyValidator.getInstance().assertOneOrLess(Property.TZNAME, observance.getProperties());
+            PropertyValidator.getInstance().assertOneOrLess(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 8d6f14fd0..7aed703fd 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoAddValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoAddValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.model.property.Method;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -70,14 +71,14 @@ public class VToDoAddValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.PRIORITY, Property.SEQUENCE, Property.SUMMARY, Property.UID).forEach(
+        Arrays.asList(DTSTAMP, ORGANIZER, PRIORITY, SEQUENCE, SUMMARY, 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()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTSTART, DUE, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PERCENT_COMPLETE, RESOURCES, STATUS, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        Arrays.asList(Property.RECURRENCE_ID, Property.REQUEST_STATUS).forEach(
+        Arrays.asList(RECURRENCE_ID, REQUEST_STATUS).forEach(
                 property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
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 38ed40dff..9697a5752 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoCancelValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoCancelValidator.java
@@ -1,7 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +8,9 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Component.VALARM;
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property   Presence
@@ -73,16 +74,16 @@ public class VToDoCancelValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        Arrays.asList(Property.UID, Property.DTSTAMP, Property.ORGANIZER, Property.SEQUENCE).forEach(
+        Arrays.asList(UID, DTSTAMP, ORGANIZER, 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,
-                Property.PERCENT_COMPLETE, Property.RECURRENCE_ID, Property.RESOURCES, Property.PRIORITY, Property.STATUS,
-                Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTSTART, DUE, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PERCENT_COMPLETE, RECURRENCE_ID, RESOURCES, PRIORITY, STATUS,
+                URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        PropertyValidator.getInstance().assertNone(REQUEST_STATUS, target.getProperties());
 
-        ComponentValidator.assertNone(Component.VALARM, target.getAlarms());
+        ComponentValidator.assertNone(VALARM, target.getAlarms());
     }
 }
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 ac221599c..1d91122ce 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoCounterValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoCounterValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.model.property.Method;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -71,15 +72,15 @@ public class VToDoCounterValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
 
-        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.PRIORITY, Property.SUMMARY, Property.UID).forEach(
+        Arrays.asList(DTSTAMP, ORGANIZER, PRIORITY, SUMMARY, 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.RECURRENCE_ID, Property.RESOURCES, Property.RRULE, Property.SEQUENCE,
-                Property.STATUS, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTSTART, DUE, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PERCENT_COMPLETE, RECURRENCE_ID, RESOURCES, RRULE, SEQUENCE,
+                STATUS, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.COUNTER);
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 8767ed26e..f206bf64a 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoDeclineCounterValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoDeclineCounterValidator.java
@@ -1,7 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +8,9 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Component.VALARM;
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property   Presence
@@ -67,16 +68,16 @@ public class VToDoDeclineCounterValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
 
-        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.SEQUENCE, Property.UID).forEach(
+        Arrays.asList(DTSTAMP, ORGANIZER, SEQUENCE, 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.LOCATION, Property.PERCENT_COMPLETE, Property.PRIORITY, Property.RECURRENCE_ID, Property.RESOURCES,
-                Property.STATUS, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTSTART, DUE, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                LOCATION, PERCENT_COMPLETE, PRIORITY, RECURRENCE_ID, RESOURCES,
+                STATUS, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        ComponentValidator.assertNone(Component.VALARM, target.getAlarms());
+        ComponentValidator.assertNone(VALARM, target.getAlarms());
     }
 }
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 233688ae3..5b372b172 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoPublishValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoPublishValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.model.property.Method;
@@ -11,6 +10,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -73,23 +74,23 @@ public class VToDoPublishValidator 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(DTSTAMP, target.getProperties());
 
         if (!CompatibilityHints.isHintEnabled(CompatibilityHints.KEY_RELAXED_VALIDATION)) {
-            Arrays.asList(Property.ORGANIZER, Property.PRIORITY).forEach(
+            Arrays.asList(ORGANIZER, PRIORITY).forEach(
                     property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
         }
 
-        Arrays.asList(Property.SUMMARY, Property.UID).forEach(
+        Arrays.asList(SUMMARY, UID).forEach(
                 property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
         // DTSTART: RFC2446 conflicts with RCF2445..
-        Arrays.asList(Property.DTSTART, Property.SEQUENCE, Property.CATEGORIES, Property.CLASS,
-                Property.CREATED, Property.DESCRIPTION, Property.DUE, Property.DURATION, Property.GEO, Property.LAST_MODIFIED,
-                Property.LOCATION, Property.PERCENT_COMPLETE, Property.RECURRENCE_ID, Property.RESOURCES, Property.STATUS,
-                Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(DTSTART, SEQUENCE, CATEGORIES, CLASS,
+                CREATED, DESCRIPTION, DUE, DURATION, GEO, LAST_MODIFIED,
+                LOCATION, PERCENT_COMPLETE, RECURRENCE_ID, RESOURCES, STATUS,
+                URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        Arrays.asList(Property.ATTENDEE, Property.REQUEST_STATUS).forEach(
+        Arrays.asList(ATTENDEE, REQUEST_STATUS).forEach(
                 property -> PropertyValidator.getInstance().assertNone(property, target.getProperties()));
 
         for (final VAlarm alarm : target.getAlarms()) {
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 2fa01c793..71737140f 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoRefreshValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoRefreshValidator.java
@@ -1,7 +1,6 @@
 package net.fortuna.ical4j.validate.component;
 
 import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property   Presence
@@ -66,16 +67,16 @@ public class VToDoRefreshValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(VToDo target) throws ValidationException {
-        Arrays.asList(Property.ATTENDEE, Property.DTSTAMP, Property.UID).forEach(
+        Arrays.asList(ATTENDEE, DTSTAMP, UID).forEach(
                 property -> PropertyValidator.getInstance().assertOne(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertOneOrLess(Property.RECURRENCE_ID, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrLess(RECURRENCE_ID, 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(
+        Arrays.asList(ATTACH, CATEGORIES, CLASS, CONTACT, CREATED,
+                DESCRIPTION, DTSTART, DUE, DURATION, EXDATE, EXRULE,
+                GEO, LAST_MODIFIED, LOCATION, ORGANIZER, PERCENT_COMPLETE,
+                PRIORITY, RDATE, RELATED_TO, REQUEST_STATUS, RESOURCES,
+                RRULE, SEQUENCE, STATUS, 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 2790b5058..25ed1ad4e 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoReplyValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoReplyValidator.java
@@ -1,7 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Component;
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.validate.ComponentValidator;
 import net.fortuna.ical4j.validate.PropertyValidator;
@@ -10,6 +8,9 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Component.VALARM;
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property   Presence
@@ -69,16 +70,16 @@ public class VToDoReplyValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
 
-        Arrays.asList(Property.DTSTAMP, Property.ORGANIZER, Property.UID).forEach(
+        Arrays.asList(DTSTAMP, ORGANIZER, 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.PRIORITY, Property.RESOURCES, Property.RECURRENCE_ID, Property.SEQUENCE,
-                Property.STATUS, Property.SUMMARY, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(CATEGORIES, CLASS, CREATED, DESCRIPTION,
+                DTSTART, DUE, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PERCENT_COMPLETE, PRIORITY, RESOURCES, RECURRENCE_ID, SEQUENCE,
+                STATUS, SUMMARY, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        ComponentValidator.assertNone(Component.VALARM, target.getAlarms());
+        ComponentValidator.assertNone(VALARM, target.getAlarms());
     }
 }
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 65ed3a903..c677e5c1d 100644
--- a/src/main/java/net/fortuna/ical4j/validate/component/VToDoRequestValidator.java
+++ b/src/main/java/net/fortuna/ical4j/validate/component/VToDoRequestValidator.java
@@ -1,6 +1,5 @@
 package net.fortuna.ical4j.validate.component;
 
-import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.component.VAlarm;
 import net.fortuna.ical4j.model.component.VToDo;
 import net.fortuna.ical4j.model.property.Method;
@@ -10,6 +9,8 @@
 
 import java.util.Arrays;
 
+import static net.fortuna.ical4j.model.Property.*;
+
 /**
  * <pre>
  * Component/Property  Presence
@@ -74,16 +75,16 @@ public class VToDoRequestValidator implements Validator<VToDo> {
     private static final long serialVersionUID = 1L;
 
     public void validate(final VToDo target) throws ValidationException {
-        PropertyValidator.getInstance().assertOneOrMore(Property.ATTENDEE, target.getProperties());
+        PropertyValidator.getInstance().assertOneOrMore(ATTENDEE, target.getProperties());
 
-        Arrays.asList(Property.DTSTAMP, Property.DTSTART, Property.ORGANIZER, Property.PRIORITY, Property.SUMMARY, Property.UID).forEach(
+        Arrays.asList(DTSTAMP, DTSTART, ORGANIZER, PRIORITY, SUMMARY, 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,
-                Property.PERCENT_COMPLETE, Property.RECURRENCE_ID, Property.RESOURCES, Property.STATUS, Property.URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
+        Arrays.asList(SEQUENCE, CATEGORIES, CLASS, CREATED,
+                DESCRIPTION, DUE, DURATION, GEO, LAST_MODIFIED, LOCATION,
+                PERCENT_COMPLETE, RECURRENCE_ID, RESOURCES, STATUS, URL).forEach(property -> PropertyValidator.getInstance().assertOneOrLess(property, target.getProperties()));
 
-        PropertyValidator.getInstance().assertNone(Property.REQUEST_STATUS, target.getProperties());
+        PropertyValidator.getInstance().assertNone(REQUEST_STATUS, target.getProperties());
 
         for (final VAlarm alarm : target.getAlarms()) {
             alarm.validate(Method.REQUEST);