diff --git a/ccm-core/src/com/arsdigita/kernel/Role.java b/ccm-core/src/com/arsdigita/kernel/Role.java
index b7dae5dd3..0c2b3512a 100755
--- a/ccm-core/src/com/arsdigita/kernel/Role.java
+++ b/ccm-core/src/com/arsdigita/kernel/Role.java
@@ -33,26 +33,19 @@ import java.sql.SQLException;
 
 /**
  * 
- * Represents a role within a group. The class of users who
- * have a given role within a group are treated as a party, so that
- * permissions can be assigned to a role within a group.
- *
- * <p>
- * This class has not yet been reviewed and is subject to change.
- * </p>
- *
- *
- * @author Michael Bryzek 
- * @version 1.0
+ * Represents a role within a group. The class of users who have a given role
+ * within a group are treated as a party, so that permissions can be assigned
+ * to a role within a group.
  *
  * @see com.arsdigita.kernel.Group#createRole(String)
+ * @author Michael Bryzek 
+ * @version 1.0
+ * @version $Id: Role.java 1169 2006-06-14 13:08:25Z fabrice $
  **/
 public class Role extends DomainObject {
 
-    public static final String versionId = "$Id: Role.java 1169 2006-06-14 13:08:25Z fabrice $ by $Author: fabrice $, $DateTime: 2004/08/16 18:10:38 $";
-
     public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.kernel.Role";
+                               "com.arsdigita.kernel.Role";
 
     private Group m_sourceGroup;
     private Group m_roleGroup;
@@ -65,6 +58,7 @@ public class Role extends DomainObject {
     // TODO: Hack until we integrated roles with permissions
     private static final String IMPLICIT_GROUP = "implicitGroup";
 
+    @Override
     protected String getBaseDataObjectType() {
         return BASE_DATA_OBJECT_TYPE;
     }
diff --git a/ccm-core/src/com/arsdigita/versioning/VersioningProcessorManager.java b/ccm-core/src/com/arsdigita/versioning/VersioningProcessorManager.java
index 98efec7e3..eff1f8b40 100755
--- a/ccm-core/src/com/arsdigita/versioning/VersioningProcessorManager.java
+++ b/ccm-core/src/com/arsdigita/versioning/VersioningProcessorManager.java
@@ -38,6 +38,7 @@ import com.redhat.persistence.EventProcessorManager;
  * @version $Revision: #6 $ $Date: 2004/08/16 $
  **/
 final class VersioningProcessorManager implements EventProcessorManager {
+    
     private static final ThreadLocal s_processor = new ThreadLocal() {
             public Object initialValue() {
                 return new VersioningEventProcessor();
diff --git a/ccm-core/src/com/arsdigita/web/Debugger.java b/ccm-core/src/com/arsdigita/web/Debugger.java
index 9d85f0624..04a63736d 100755
--- a/ccm-core/src/com/arsdigita/web/Debugger.java
+++ b/ccm-core/src/com/arsdigita/web/Debugger.java
@@ -81,6 +81,7 @@ public abstract class Debugger {
     public abstract String debug();
 
     private static class DebuggerListLocal extends InternalRequestLocal {
+        @Override
         protected Object initialValue() {
             if (Kernel.getConfig().isDebugEnabled()) {
                 return new ArrayList();
@@ -89,6 +90,7 @@ public abstract class Debugger {
             }
         }
 
+        @Override
         protected void clearValue() {
             if (Kernel.getConfig().isDebugEnabled()) {
                 ArrayList list = (ArrayList) get();
diff --git a/ccm-core/src/com/arsdigita/workflow/simple/WorkflowTemplate.java b/ccm-core/src/com/arsdigita/workflow/simple/WorkflowTemplate.java
index 4b794a163..b3536b451 100755
--- a/ccm-core/src/com/arsdigita/workflow/simple/WorkflowTemplate.java
+++ b/ccm-core/src/com/arsdigita/workflow/simple/WorkflowTemplate.java
@@ -29,8 +29,11 @@ import com.arsdigita.persistence.metadata.ObjectType;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.kernel.User;
 
+/**
+ * 
+ * @version $Id: WorkflowTemplate.java 287 2005-02-22 00:29:02Z sskracic $
+ */
 public class WorkflowTemplate extends Workflow {
-    public static final String versionId = "$Id: WorkflowTemplate.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $";
 
     public static final String BASE_DATA_OBJECT_TYPE =
         "com.arsdigita.workflow.simple.WorkflowTemplate";