diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
index cdcf65cdb..53ef1ba96 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -136,10 +136,8 @@ public class BaseEditController extends VitroHttpServlet {
             String value = "";
             if (key.equals(MULTIPLEXED_PARAMETER_NAME)) {
                 String multiplexedStr = request.getParameterValues(key)[0];
-                Map paramMap = FormUtils.beanParamMapFromString(multiplexedStr);
-                Iterator paramIt = paramMap.keySet().iterator();
-                while (paramIt.hasNext()) {
-                    String param = (String) paramIt.next();
+                Map<String, String> paramMap = FormUtils.beanParamMapFromString(multiplexedStr);
+                for (String param : paramMap.keySet()) {
                     String demultiplexedValue = (String) paramMap.get(param);
                     FormUtils.beanSet(bean, param, demultiplexedValue);
                 }
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
index 1d5b282f0..b9b78b384 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
@@ -205,12 +205,8 @@ public class OperationController extends BaseEditController {
     
     private void runPreprocessors(EditProcessObject epo, Object newObj) {
     	if (epo.getPreProcessorList() != null && epo.getPreProcessorList().size()>0) {
-            Iterator preIt = epo.getPreProcessorList().iterator();
-            while (preIt.hasNext()) {
-                try {
-                	EditPreProcessor epp = (EditPreProcessor) preIt.next();
-                	epp.process(newObj, epo);
-                } catch (ClassCastException e) {}
+            for (EditPreProcessor epp : epo.getPreProcessorList()) {
+                epp.process(newObj, epo);
             }
         }
     }
@@ -329,9 +325,7 @@ public class OperationController extends BaseEditController {
     private void notifyChangeListeners(EditProcessObject epo, String action) {
     	List<ChangeListener> changeListeners = epo.getChangeListenerList();
         if (changeListeners != null){
-            Iterator<ChangeListener> changeIt = changeListeners.iterator();
-            while (changeIt.hasNext()) {
-                ChangeListener cl = changeIt.next();
+            for (ChangeListener cl : changeListeners) {
                 switch (action) {
                     case "insert":
                         cl.doInserted(epo.getNewBean(), epo);
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
index da30a34b8..f7148ccd1 100644
--- a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
+++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java
@@ -267,11 +267,7 @@ public class FormUtils {
         	}
 		}
 		
-		Collections.sort(options, new Comparator<Option>() {
-			@Override
-			public int compare(Option o1, Option o2) {
-				return o1.getBody().compareTo(o2.getBody());
-			}});
+		Collections.sort(options, (o1, o2) -> o1.getBody().compareTo(o2.getBody()));
 		
 		return options;
 	}
@@ -367,9 +363,9 @@ public class FormUtils {
      * key:value;key2:value2;key3:value, and puts the keys and values in a Map
      * @param params Parameters
      */
-    public static Map beanParamMapFromString(String params) {
+    public static Map<String, String> beanParamMapFromString(String params) {
         String[] param = params.split(";");
-        Map beanParamMap = new HashMap();
+        Map<String, String> beanParamMap = new HashMap<String, String>();
         for (String aParam : param) {
             String[] p = aParam.split(":");
             beanParamMap.put(p[0], new String(Base64.decodeBase64(p[1].getBytes())));
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
index 8748744c5..0939225eb 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 
 public interface ObjectPropertyDao extends PropertyDao {
 
@@ -27,7 +28,7 @@ public interface ObjectPropertyDao extends PropertyDao {
      */
     public ObjectProperty getObjectPropertyByURIs(String objectPropertyURI, String domainURI, String rangeURI, ObjectProperty base);
 
-    public List <ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
+    public List <ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List<ObjectPropertyStatement> objectPropertyStatements);
 
     public List<String> getSuperPropertyURIs(String objectPropertyURI, boolean direct);
 
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
index ac206ea8c..23723883a 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyDaoFiltering.java
@@ -5,6 +5,7 @@ package edu.cornell.mannlib.vitro.webapp.dao.filtering;
 import java.util.LinkedList;
 import java.util.List;
 
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import net.sf.jga.algorithms.Filter;
 import net.sf.jga.fn.UnaryFunctor;
 import net.sf.jga.fn.adaptor.AndUnary;
@@ -32,7 +33,7 @@ class ObjectPropertyDaoFiltering extends BaseFiltering implements ObjectProperty
         return filterAndWrap(innerObjectPropertyDao.getAllObjectProperties(), filters);        
     }
 
-    public List getObjectPropertiesForObjectPropertyStatements(List objectPropertyStatements) {
+    public List getObjectPropertiesForObjectPropertyStatements(List<ObjectPropertyStatement> objectPropertyStatements) {
         //assume that the objPropStmts are already filtered
         List<ObjectProperty> list =
             innerObjectPropertyDao
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index 0082b9ea9..91c81f5cb 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -474,15 +474,13 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
     }
     
 
-    public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List objPropertyStmts) {
+    public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List<ObjectPropertyStatement> objPropertyStmts) {
         if( objPropertyStmts == null || objPropertyStmts.size() < 1) return new ArrayList();
         HashMap<String,ObjectProperty> hash = new HashMap<String,ObjectProperty>();
         String uris ="";
         getOntModel().enterCriticalSection(Lock.READ);
         try {
-            Iterator it = objPropertyStmts.iterator();
-            while(it.hasNext()){
-                ObjectPropertyStatement objPropertyStmt = (ObjectPropertyStatement)it.next();
+            for (ObjectPropertyStatement objPropertyStmt : objPropertyStmts) {
                 if (hash.containsKey(objPropertyStmt.getPropertyURI())) {
                     ObjectProperty p = hash.get(objPropertyStmt.getPropertyURI());
                     p.addObjectPropertyStatement(objPropertyStmt);
@@ -490,7 +488,7 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                     OntProperty op = getOntModel().getOntProperty(objPropertyStmt.getPropertyURI());
                     if (op != null) {
                         ObjectProperty p = propertyFromOntProperty(op);
-                        hash.put(p.getURI(),p);
+                        hash.put(p.getURI(), p);
                         p.addObjectPropertyStatement(objPropertyStmt);
                     }
                 }
@@ -873,13 +871,11 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
 	                    		isRoot = true;
 	                    	} else {
 	                    		isRoot = true;
-	                    	    Iterator<? extends Property> pit = parentList.iterator();
-	                    	    while (pit.hasNext()) {
-	                    	    	Property pt = pit.next();
-	                    	    	if ( (!pt.equals(op)) && (!(getOntModel().contains(op,OWL.equivalentProperty,pt)) || (getOntModel().contains(pt,OWL.equivalentProperty,op))) ) {
-	                    	    		isRoot = false;
-	                    	    	}
-	                    	    }
+                                for (Property pt : parentList) {
+                                    if ((!pt.equals(op)) && (!(getOntModel().contains(op, OWL.equivalentProperty, pt)) || (getOntModel().contains(pt, OWL.equivalentProperty, op)))) {
+                                        isRoot = false;
+                                    }
+                                }
 	                    	} 
 	                    } else {
 	                    	isRoot = true;
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
index 19fb1dc15..42a11b037 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetObjectClasses.java
@@ -77,19 +77,15 @@ public class GetObjectClasses extends BaseEditController {
 		if (vClass != null) {
 			respo.append("<option>" + "<key>").append(vClass.getPickListName()).append("</key>").append("<value>").append(vClass.getURI()).append("</value>").append("</option>");
 		} else {
-			List classGroups = vreq.getUnfilteredWebappDaoFactory()
+			List<VClassGroup> classGroups = vreq.getUnfilteredWebappDaoFactory()
 					.getVClassGroupDao().getPublicGroupsWithVClasses(true,
 							true, false); // order by displayRank, include
 											// uninstantiated classes, don't get
 											// the counts of individuals
 
-			Iterator classGroupIt = classGroups.iterator();
-			while (classGroupIt.hasNext()) {
-				VClassGroup group = (VClassGroup) classGroupIt.next();
-				List classes = group.getVitroClassList();
-				Iterator classIt = classes.iterator();
-				while (classIt.hasNext()) {
-					VClass clazz = (VClass) classIt.next();
+			for (VClassGroup group : classGroups) {
+				List<VClass> classes = group.getVitroClassList();
+				for (VClass clazz : classes) {
 					respo.append("<option>" + "<key>").append(clazz.getPickListName()).append("</key>").append("<value>").append(clazz.getURI()).append("</value>").append("</option>");
 				}
 			}
diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
index 88fee1e99..31189f2e6 100644
--- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
+++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
@@ -12,6 +12,7 @@ import com.google.common.base.Objects;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
@@ -257,7 +258,7 @@ public class ObjectPropertyDaoStub implements ObjectPropertyDao {
 
 	@Override
 	public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(
-			List objectPropertyStatements) {
+			List<ObjectPropertyStatement> objectPropertyStatements) {
 		throw new RuntimeException(
 				"ObjectPropertyDaoStub.getObjectPropertiesForObjectPropertyStatements() not implemented.");
 	}