diff --git a/ChangeLog b/ChangeLog
index dc5cc9f8..895adedd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun  2 01:35:25 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* demangle.c: Remove weird comment.
+
+	* elfparser.h: Formatting.
+
 Mon Jun  2 01:14:17 2008  Søren Sandmann  <sandmann@redhat.com>
 
 	* binfile.c (get_debug_binaries): Remove left-over #if 0
diff --git a/demangle.c b/demangle.c
index 54188dec..a6c9c45d 100644
--- a/demangle.c
+++ b/demangle.c
@@ -1,6 +1,4 @@
 /*
- * "I bred them together to create a monster"
- *
  * This file is a concatenation of the files
  *
  *	cp-demangle.c
@@ -62,7 +60,6 @@
    Boston, MA 02111-1307, USA.
 */
 
-
 /* This code implements a demangler for the g++ V3 ABI.  The ABI is
    described on this web page:
        http://www.codesourcery.com/cxx-abi/abi.html#mangling
diff --git a/elfparser.h b/elfparser.h
index 53d4cbfb..c01274c1 100644
--- a/elfparser.h
+++ b/elfparser.h
@@ -20,23 +20,23 @@
 typedef struct ElfSym ElfSym;
 typedef struct ElfParser ElfParser;
 
-ElfParser *   elf_parser_new_from_data  (const guchar *data,
-					 gsize	       length);
-ElfParser *   elf_parser_new            (const char  *filename,
-					 GError     **err);
-void          elf_parser_free           (ElfParser   *parser);
-const char *  elf_parser_get_debug_link (ElfParser   *parser,
-					 guint32     *crc32);
-const gchar  *elf_parser_get_build_id   (ElfParser   *parser);
-const guchar *elf_parser_get_eh_frame   (ElfParser   *parser);
-const guchar *elf_parser_get_debug_frame (ElfParser   *parser);
-gulong	      elf_parser_get_text_offset (ElfParser  *parser);
+ElfParser *   elf_parser_new_from_data   (const guchar  *data,
+					  gsize          length);
+ElfParser *   elf_parser_new             (const char    *filename,
+					  GError       **err);
+void          elf_parser_free            (ElfParser     *parser);
+const char *  elf_parser_get_debug_link  (ElfParser     *parser,
+					  guint32       *crc32);
+const gchar  *elf_parser_get_build_id    (ElfParser     *parser);
+const guchar *elf_parser_get_eh_frame    (ElfParser     *parser);
+const guchar *elf_parser_get_debug_frame (ElfParser     *parser);
+gulong        elf_parser_get_text_offset (ElfParser     *parser);
+
 
 /* Lookup a symbol in the file.
  *
- * The symbol returned is const, so don't free it it or anything. It
- * will be valid until elf_parser_free() is called on the parser.
- *
+ * The symbol returned is const, so don't free it. It is valid until
+ * elf_parser_free() is called on the parser.
  *
  * The address should be given in "file coordinates". This means that
  * if the file is mapped at address m and offset o, then an address a
@@ -44,13 +44,14 @@ gulong	      elf_parser_get_text_offset (ElfParser  *parser);
  * of the file would have been mapped, so a - (m - o) is the position
  * in the file of a.
  */
-const ElfSym *elf_parser_lookup_symbol (ElfParser *parser,
-					gulong     address);
-guint32 elf_parser_get_crc32 (ElfParser *parser);
-const char *elf_parser_get_sym_name (ElfParser *parser,
-				     const ElfSym *sym);
-gulong elf_parser_get_sym_address (ElfParser *parser,
-				   const ElfSym *sym);
-gboolean elf_parser_owns_symbol (ElfParser *parser,
-				 const ElfSym *sym);
-char *elf_demangle (const char *name);
+const ElfSym *elf_parser_lookup_symbol   (ElfParser     *parser,
+					  gulong         address);
+guint32       elf_parser_get_crc32       (ElfParser     *parser);
+const char *  elf_parser_get_sym_name    (ElfParser     *parser,
+					  const ElfSym  *sym);
+gulong        elf_parser_get_sym_address (ElfParser     *parser,
+					  const ElfSym  *sym);
+gboolean      elf_parser_owns_symbol     (ElfParser     *parser,
+					  const ElfSym  *sym);
+char *        elf_demangle               (const char    *name);
+