diff --git a/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java b/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java
index a0492019b4236a64c7064b01f08b6fb0ae0cbe7c..804f7b97b8a1f82f910c721e47d684d530680352 100644
--- a/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java
+++ b/common/source/java/ch/systemsx/cisd/common/collections/FilteredCollection.java
@@ -76,7 +76,7 @@ public class FilteredCollection<E> extends AbstractCollectionDecorator<E>
         {
             return null;
         }
-        for (Iterator<? extends E> iter = collection.iterator(); iter.hasNext();)
+        for (Iterator<? extends E> iter = collection.iterator(); iter.hasNext(); )
         {
             if (validator.isValid(iter.next()) == false)
             {
diff --git a/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java b/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java
index ae1d5c5a72f94339ed11c22f695200455b799a0c..44c7206d2e64c641a894334f748fa1835d0431ee 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/DBTableRestrictions.java
@@ -38,7 +38,7 @@ public class DBTableRestrictions
     public int getLength(String columnName)
     {
         final Integer columnLength = columnLengthMap.get(columnName);
-        assert columnLength != null : "Illegal column '" + columnName +"'.";
+        assert columnLength != null : "Illegal column '" + columnName + "'.";
         return columnLength;
     }
 
diff --git a/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java b/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java
index ad2c37b98eaf440dfec184ec2ce009903427a238..fd51ae77c70055fff9b8d3d3e3fad3798ae32684 100644
--- a/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java
+++ b/common/source/java/ch/systemsx/cisd/common/logging/LogFactory.java
@@ -51,7 +51,7 @@ public final class LogFactory
         {
             throw new IllegalArgumentException("Only admin logs are allowed here, but we got " + category + ".");
         }
-        return category.name() ;
+        return category.name();
     }
 
     /**
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
index 3bcb59cf1d919e5f95d9fb5e742cf35d9ac495b4..06abb2ec956cbd975706116ff4a449df54a1e837 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/BeanUtils.java
@@ -815,7 +815,7 @@ public final class BeanUtils
             final List<PropertyDescriptor> descriptors =
                     new ArrayList<PropertyDescriptor>(Arrays.asList(Introspector.getBeanInfo(clazz)
                             .getPropertyDescriptors()));
-            for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext();)
+            for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext(); )
             {
                 final PropertyDescriptor descriptor = iter.next();
                 // If no write method, remove it. For instance 'class' property does not have any
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java b/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java
index 7fee335084bc8b40e35a49495a6e25013bfbd982..a811bd2bac5554859652ba17c9b1fd97f8cde8af 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/ExtendedProperties.java
@@ -87,7 +87,7 @@ public final class ExtendedProperties extends Properties
 
         ExtendedProperties result = new ExtendedProperties();
         int prefixLength = prefix.length();
-        for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements();)
+        for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements(); )
         {
             String key = enumeration.nextElement().toString();
             if (key.startsWith(prefix))
@@ -99,11 +99,11 @@ public final class ExtendedProperties extends Properties
     }
 
     /**
-     * Removes all properies with names starting with given prefix
+     * Removes all properties with names starting with given prefix
      */
     public void removeSubset(final String prefix)
     {
-        for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements();)
+        for (Enumeration<?> enumeration = propertyNames(); enumeration.hasMoreElements(); )
         {
             String key = enumeration.nextElement().toString();
             if (key.startsWith(prefix))
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java
index 13f7ba59e186154caa3f0a0bd03568d45f7282ca..939c6df058a3f02d00499b16dcbfc88dbc0ff307 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/utilities/BeanUtilsTest.java
@@ -56,7 +56,7 @@ public final class BeanUtilsTest
         assertEquals(1, descriptors.size());
         PropertyDescriptor outerDescriptor = null;
         // Play with property 'description'
-        for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext();)
+        for (Iterator<PropertyDescriptor> iter = descriptors.iterator(); iter.hasNext(); )
         {
             PropertyDescriptor innerDescriptor = iter.next();
             if (innerDescriptor.getName().equals("foo"))