diff --git a/include/rampart_encryption.h b/include/rampart_encryption.h
index eae3c79..3b96270 100644
--- a/include/rampart_encryption.h
+++ b/include/rampart_encryption.h
@@ -1,17 +1,18 @@
 /*
- *   Copyright 2003-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #include <axutil_utils_defines.h>
@@ -22,16 +23,17 @@
 #include <oxs_asym_ctx.h>
 #include <oxs_xml_encryption.h>
 #include <rampart_context.h>
-/**
-  * @file rampart_encryption.h
-  * @brief encrypts a SOAP message 
-  */
 
 /**
-* @defgroup rampart_encryption Encryption
-* @ingroup rampart_utils
-* @{
-*/
+ * @file rampart_encryption.h
+ * @brief encrypts a SOAP message 
+ */
+
+/**
+ * @defgroup rampart_encryption Encryption
+ * @ingroup rampart_utils
+ * @{
+ */
 #ifndef RAMPART_ENCRYPTION_H
 #define RAMPART_ENCRYPTION_H
 
@@ -54,14 +56,17 @@
         axiom_node_t *sec_node);
 
     /**
-    * @param env pointer to environment struct
-    * @param msg_ctx message context
-    * @param soap_envelope the SOAP envelope
-    * @param sec_node The security element
-    * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-    */
+     * Encrypt the message using derived keys. Uses symmetric encryption
+     * @param env pointer to environment struct
+     * @param msg_ctx message context
+     * @param rampart_context rampart context
+     * @param soap_envelope the SOAP envelope
+     * @param sec_node The security element
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    rampart_enc_dk_encrypt_message(const axutil_env_t *env,
+    rampart_enc_dk_encrypt_message(
+        const axutil_env_t *env,
         axis2_msg_ctx_t *msg_ctx,
         rampart_context_t *rampart_context,
         axiom_soap_envelope_t *soap_envelope,
@@ -100,20 +105,20 @@
         axiom_node_t *sec_node);
 
     /**
-    * @param env pointer to environment struct
-    * @param session_key the session key to be encrypted
-    * @param msg_ctx message context
-    * @param rampart_context the rampart context
-    * @param soap_envelope the SOAP envelope
-    * @param sec_node The security element
-    * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
-    */
+     * Encrypts the session key using assymmetric encription
+     * @param env pointer to environment struct
+     * @param session_key the session key to be encrypted
+     * @param msg_ctx message context
+     * @param rampart_context the rampart context
+     * @param sec_node The security element
+     * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+     */
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
-    rampart_enc_encrypt_session_key(const axutil_env_t *env,
+    rampart_enc_encrypt_session_key(
+        const axutil_env_t *env,
         oxs_key_t *session_key,
         axis2_msg_ctx_t *msg_ctx,
         rampart_context_t *rampart_context,
-        axiom_soap_envelope_t *soap_envelope,
         axiom_node_t *sec_node,
         axutil_array_list_t *id_list);
 
diff --git a/include/rampart_mod.h b/include/rampart_mod.h
index 81631c3..187691c 100644
--- a/include/rampart_mod.h
+++ b/include/rampart_mod.h
@@ -37,22 +37,24 @@
     /**
      * Creates In handler
      * @param env pointer to environment struct
-     * @param qname 
+     * @param name handler name 
      * @return Created In handler
      */
     AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-    rampart_in_handler_create(const axutil_env_t *env,
-                              axutil_string_t *name);
+    rampart_in_handler_create(
+        const axutil_env_t *env,
+        axutil_string_t *name);
 
     /**
      * Creates Out handler
      * @param env pointer to environment struct
-     * @param qname 
+     * @param name handler name 
      * @return Created Out handler
      */
     AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
-    rampart_out_handler_create(const axutil_env_t *env,
-                               axutil_string_t *name);
+    rampart_out_handler_create(
+        const axutil_env_t *env,
+        axutil_string_t *name);
 
     /** @} */