diff --git a/modules/maxfwd/api.h b/modules/maxfwd/api.h
index d9dcad69522..f1062f43bcf 100644
--- a/modules/maxfwd/api.h
+++ b/modules/maxfwd/api.h
@@ -15,8 +15,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
diff --git a/modules/maxfwd/maxfwd.c b/modules/maxfwd/maxfwd.c
index b7447922cac..eb7764cb292 100644
--- a/modules/maxfwd/maxfwd.c
+++ b/modules/maxfwd/maxfwd.c
@@ -1,6 +1,4 @@
-/*
- * $Id$
- *
+/**
  * MAXFWD module
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -17,21 +15,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History:
- * --------
- *  2003-03-11  updated to the new module interface (andrei)
- *  2003-03-16  flags export parameter added (janakj)
- *  2003-03-19  all mallocs/frees replaced w/ pkg_malloc/pkg_free (andrei)
- *  2004-08-15  max value of max-fwd header is configurable via max_limit
- *              module param (bogdan)
- *  2005-09-15  max_limit param cannot be disabled anymore (according to RFC)
- *              (bogdan)
- *  2005-11-03  is_maxfwd_lt() function added; MF value saved in 
- *              msg->maxforwards->parsed (bogdan)
  */
 
 
diff --git a/modules/maxfwd/mf_funcs.c b/modules/maxfwd/mf_funcs.c
index 0054e5ea60f..5fb9d9bd8c2 100644
--- a/modules/maxfwd/mf_funcs.c
+++ b/modules/maxfwd/mf_funcs.c
@@ -15,16 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * History:
- * ----------
- * 2003-02-28 scratchpad compatibility abandoned (jiri)
- * 2002-01-28 scratchpad removed (jiri)
- * 2004-08-15 max value of max-fwd header is configurable (bogdan)
- * 2005-11-03 MF value saved in msg->maxforwards->parsed (bogdan)
  */
 
 
@@ -40,7 +33,7 @@
 #define MF_HDR "Max-Forwards: "
 #define MF_HDR_LEN (sizeof(MF_HDR) - 1)
 
-/* do a tricky thing and keep the parsed value of MAXFWD hdr incremented 
+/* do a tricky thing and keep the parsed value of MAXFWD hdr incremented
  * by one in order to make difference between 0 (not set)
  * and 0 (zero value) - bogdan */
 #define IS_MAXWD_STORED(_msg_) \
@@ -51,7 +44,7 @@
 	(((int)(long)(_msg_)->maxforwards->parsed)-1)
 
 /* looks for the MAX FORWARDS header
-   returns its value, -1 if is not present or -2 for error */
+	* returns its value, -1 if is not present or -2 for error */
 int is_maxfwd_present( struct sip_msg* msg , str *foo)
 {
 	int x, err;
diff --git a/modules/maxfwd/mf_funcs.h b/modules/maxfwd/mf_funcs.h
index d602cf86aa6..be01e0caf2f 100644
--- a/modules/maxfwd/mf_funcs.h
+++ b/modules/maxfwd/mf_funcs.h
@@ -15,8 +15,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */