diff --git a/ccm-forum/src/com/arsdigita/forum/Forum.java b/ccm-forum/src/com/arsdigita/forum/Forum.java
index 5dfab5815..9b8260b12 100755
--- a/ccm-forum/src/com/arsdigita/forum/Forum.java
+++ b/ccm-forum/src/com/arsdigita/forum/Forum.java
@@ -53,14 +53,15 @@ import com.arsdigita.web.Application;
  *
  * @author Kevin Scaldeferri (kevin@arsdigita.com)
  * @author chrisg23
- * @version $Revision: $
+ * @version $Revision:  1.7 $ 
  * @version $Id: Forum.java 1628 2007-09-17 08:10:40Z chrisg23 $
  */
 
 public class Forum extends Application {
 
-	public static final String THREAD_SUBSCRIPTION_GROUPS_NAME = "Thread Subscription Groups";
- 
+	public static final String THREAD_SUBSCRIPTION_GROUPS_NAME =
+                                   "Thread Subscription Groups";
+
     private static ForumConfig s_config = new ForumConfig();
 
     static {
diff --git a/ccm-forum/src/com/arsdigita/forum/Loader.java b/ccm-forum/src/com/arsdigita/forum/Loader.java
index e276a09da..4cc502de6 100755
--- a/ccm-forum/src/com/arsdigita/forum/Loader.java
+++ b/ccm-forum/src/com/arsdigita/forum/Loader.java
@@ -25,7 +25,7 @@ import com.arsdigita.kernel.EmailAddress;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
 // unused?
-import com.arsdigita.kernel.Party;
+// import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.User;
 import com.arsdigita.kernel.UserCollection;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
@@ -40,7 +40,12 @@ import org.apache.log4j.Logger;
 
 
 /**
- * Loader.
+ * Loader executes nonrecurring at install time and loads (installs and
+ * initializes) the Forum module.
+ *
+ * It loads an application type into database. Detailed configuration is done
+ * during initialization at each application start using configuration
+ * parameters.
  *
  * @author Justin Ross <jross@redhat.com>
  * @version $Id: Loader.java 1628 2007-09-17 08:10:40Z chrisg23 $
@@ -64,6 +69,10 @@ public class Loader extends PackageLoader {
         }.run();
     }
 
+    /**
+     * Creates Forum as a legacy-compatible application type.
+     * @return
+     */
     private static ApplicationType setupForumAppType() {
         ApplicationType type = ApplicationType
             .createApplicationType(Forum.PACKAGE_TYPE,
@@ -135,11 +144,18 @@ public class Loader extends PackageLoader {
             Forum.FORUM_MODERATION_PRIVILEGE);
         PrivilegeDescriptor.createPrivilege(
             Forum.CREATE_THREAD_PRIVILEGE);
-		PrivilegeDescriptor.createPrivilege(
-					Forum.RESPOND_TO_THREAD_PRIVILEGE);
-		PrivilegeDescriptor.addChildPrivilege(Forum.FORUM_MODERATION_PRIVILEGE, Forum.CREATE_THREAD_PRIVILEGE);
-		PrivilegeDescriptor.addChildPrivilege(Forum.CREATE_THREAD_PRIVILEGE, Forum.RESPOND_TO_THREAD_PRIVILEGE);
-		PrivilegeDescriptor.addChildPrivilege(Forum.RESPOND_TO_THREAD_PRIVILEGE, PrivilegeDescriptor.READ.getName());
+
+            PrivilegeDescriptor.createPrivilege(
+                                        Forum.RESPOND_TO_THREAD_PRIVILEGE);
+            PrivilegeDescriptor.addChildPrivilege(
+                                        Forum.FORUM_MODERATION_PRIVILEGE,
+                                        Forum.CREATE_THREAD_PRIVILEGE);
+            PrivilegeDescriptor.addChildPrivilege(
+                                        Forum.CREATE_THREAD_PRIVILEGE,
+                                        Forum.RESPOND_TO_THREAD_PRIVILEGE);
+            PrivilegeDescriptor.addChildPrivilege(
+                                        Forum.RESPOND_TO_THREAD_PRIVILEGE,
+                                        PrivilegeDescriptor.READ.getName());