diff --git a/src/preferences/keymap/KeymapListItem.cpp b/src/preferences/keymap/KeymapListItem.cpp
index 20e8800cfb..bdeec4d886 100644
--- a/src/preferences/keymap/KeymapListItem.cpp
+++ b/src/preferences/keymap/KeymapListItem.cpp
@@ -7,17 +7,13 @@
  *		Jérôme Duval
  */
 
-/*
- * A BStringItem modified such that it holds
- * the BEntry object it corresponds with
- */
- 
+
 #include "KeymapListItem.h"
 
 
 KeymapListItem::KeymapListItem(entry_ref& keymap, const char* name)
 	:
-	BStringItem(name ? name : keymap.name),
+	BStringItem(name != NULL ? name : keymap.name),
 	fKeymap(keymap)
 {
 }
diff --git a/src/preferences/keymap/KeymapListItem.h b/src/preferences/keymap/KeymapListItem.h
index 88c2c6b7dd..9fbdb5f0e2 100644
--- a/src/preferences/keymap/KeymapListItem.h
+++ b/src/preferences/keymap/KeymapListItem.h
@@ -10,13 +10,16 @@
 #define KEYMAP_LIST_ITEM_H
 
 
+/*
+ * A BStringItem modified so that it holds the BEntry object of the
+ * corresponding keymap.
+ */
+
+
 #include <ListItem.h>
 #include <Entry.h>
 
 
-/*!	A BStringItem modified such that it holds
-	the BEntry object it corresponds with
-*/
 class KeymapListItem : public BStringItem {
 public:
 								KeymapListItem(entry_ref& keymap,