diff --git a/src/cairo_elements.cc b/src/cairo_elements.cc
index 71849e6..4fcd19e 100644
--- a/src/cairo_elements.cc
+++ b/src/cairo_elements.cc
@@ -31,7 +31,8 @@ using namespace sgpem;
 
 CairoElements::CairoElements(cairo_t* const ctx)
     : _ctx(ctx)
-{}
+{
+}
 
 
 void
diff --git a/src/cairo_elements.hh b/src/cairo_elements.hh
index 21c3916..9e1ceec 100644
--- a/src/cairo_elements.hh
+++ b/src/cairo_elements.hh
@@ -22,7 +22,6 @@
 #define CAIRO_ELEMENTS_HH 1
 
 
-
 #include <sgpemv2/thread.hh>
 #include <sgpemv2/process.hh>
 
diff --git a/src/cairo_widget.cc b/src/cairo_widget.cc
index ec4d3ec..3545911 100644
--- a/src/cairo_widget.cc
+++ b/src/cairo_widget.cc
@@ -110,7 +110,6 @@ CairoWidget::on_realize()
   set_window(window);
   window->set_user_data(gobj());
 
-  // Not sure if the following line is needed:
   gtk_style_attach(get_style()->gobj(), window->gobj());
   get_style()->set_background(window, Gtk::STATE_ACTIVE);
 }
diff --git a/src/configure_policy_dialog.hh b/src/configure_policy_dialog.hh
index decf7b4..bd0eba2 100644
--- a/src/configure_policy_dialog.hh
+++ b/src/configure_policy_dialog.hh
@@ -21,8 +21,10 @@
 #ifndef CONFIGURE_POLICY_DIALOG_HH
 #define CONFIGURE_POLICY_DIALOG_HH 1
 
+
 #include <sgpemv2/policy_parameters.hh>
 
+
 #include <glibmm/ustring.h>
 #include <gtkmm/box.h>
 #include <gtkmm/frame.h>
@@ -57,7 +59,7 @@ namespace sgpem
     Gtk::Table* _table_float;
     Gtk::Table* _table_string;
 
-  }; //~ class ConfigurePolicyDialog
+  }; 
 
 } //~ namespace sgpem
 
diff --git a/src/graphical_preferences_editor.hh b/src/graphical_preferences_editor.hh
index 9eacaa0..231663c 100644
--- a/src/graphical_preferences_editor.hh
+++ b/src/graphical_preferences_editor.hh
@@ -22,10 +22,9 @@
 #define GRAPHICAL_PREFERENCES_EDITOR_HH 1
 
 
-
-
 #include <sgpemv2/global_preferences.hh>
 
+
 #include <libglademm/xml.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/dialog.h>
@@ -68,11 +67,11 @@ namespace sgpem
 
 	private:
 
-    void
-    update_policies();
+    		void
+    		update_policies();
 
-    void
-    update_plugins();
+    		void
+    		update_plugins();
 
 		Glib::RefPtr<Gnome::Glade::Xml> _refXml;
 		Gtk::Dialog* preferences_dialog;
@@ -93,6 +92,6 @@ namespace sgpem
 
 	};
 
-}
+} // ~ namespace
 
-#endif
+#endif // ~ GRAPHICAL_PREFERENCES_EDITOR_HH
diff --git a/src/testsuite/test-global_preferences_serialization.cc b/src/testsuite/test-global_preferences_serialization.cc
index f3b9af6..77f4b6d 100644
--- a/src/testsuite/test-global_preferences_serialization.cc
+++ b/src/testsuite/test-global_preferences_serialization.cc
@@ -1,4 +1,4 @@
-// src/testsuite/test-stepforward.cc - Copyright 2005, 2006, University
+// src/testsuite/test-global_preferences_serialization.cc - Copyright 2005, 2006, University
 //               of Padova, dept. of Pure and Applied
 //               Mathematics
 //
@@ -71,7 +71,6 @@ main(int argc, char** argv)
   */
   cout << "Config saved" << endl;
   gp.write_configrc();
-  // TODO - terminate me as soon as possible - please!!!
   gp.write_configrc(cout);
 
   ostringstream os1;