diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 04cc9e13f0a9fd3af94949671135d9262ff336d4..69709d8af92fd28d4eb17e592163f01aa86a591d 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1400,44 +1400,46 @@ void GModel::registerBindings(binding *b)
   cb->setDescription("A GModel contains a geometrycal and it's mesh.");
   methodBinding *cm;
   cm = cb->addMethod("mesh", &GModel::mesh);
-  cm->setArgNames("dim",NULL);
+  cm->setArgNames("dim", NULL);
   cm->setDescription("Generate a mesh of this model in dimension 'dim'.");
   cm = cb->addMethod("load", &GModel::load);
-  cm->setDescription("Merge the file 'filename' in this model, the file can be in any format (guessed from the extension) known by gmsh.");
-  cm->setArgNames("filename",NULL);
+  cm->setDescription("Merge the file 'filename' in this model, the file can be "
+                     "in any format (guessed from the extension) known by gmsh.");
+  cm->setArgNames("filename", NULL);
   cm = cb->addMethod("save", &GModel::save);
-  cm->setDescription("Save this model in the file 'filename'. The content of the file depends on the format (guessed from the extension).");
-  cm->setArgNames("filename",NULL);
-  cm = cb->addMethod("getNumMeshElements",(int (GModel::*)()) &GModel::getNumMeshElements);
+  cm->setDescription("Save this model in the file 'filename'. The content of the "
+                     "file depends on the format (guessed from the extension).");
+  cm->setArgNames("filename", NULL);
+  cm = cb->addMethod("getNumMeshElements", (int (GModel::*)())&GModel::getNumMeshElements);
   cm->setDescription("return the number of mesh elemnts in the model");
-  cm = cb->addMethod("getMeshElementByTag",&GModel::getMeshElementByTag);
-  cm->setArgNames("tag",NULL);
+  cm = cb->addMethod("getMeshElementByTag", &GModel::getMeshElementByTag);
+  cm->setArgNames("tag", NULL);
   cm->setDescription("access a mesh element by tag, using the element cache");
-  cm = cb->addMethod("getNumMeshVertices",&GModel::getNumMeshVertices);
+  cm = cb->addMethod("getNumMeshVertices", &GModel::getNumMeshVertices);
   cm->setDescription("return the total number of vertices in the mesh");
-  cm = cb->addMethod("getMeshVertexByTag",&GModel::getMeshVertexByTag);
+  cm = cb->addMethod("getMeshVertexByTag", &GModel::getMeshVertexByTag);
   cm->setDescription("access a mesh vertex by tag, using the vertex cache");
-  cm->setArgNames("tag",NULL);
-  cm = cb->addMethod("getNumRegions",&GModel::getNumRegions);
+  cm->setArgNames("tag", NULL);
+  cm = cb->addMethod("getNumRegions", &GModel::getNumRegions);
   cm->setDescription("return the number of rgions (3D geometrical entities)");
-  cm = cb->addMethod("getNumFaces",&GModel::getNumFaces);
+  cm = cb->addMethod("getNumFaces", &GModel::getNumFaces);
   cm->setDescription("return the number of faces (2D geometrical entities)");
-  cm = cb->addMethod("getNumEdges",&GModel::getNumEdges);
+  cm = cb->addMethod("getNumEdges", &GModel::getNumEdges);
   cm->setDescription("return the number of edges (1D geometrical entities)");
-  cm = cb->addMethod("getNumVertices",&GModel::getNumVertices);
+  cm = cb->addMethod("getNumVertices", &GModel::getNumVertices);
   cm->setDescription("return the number of vertices (0D geometrical entities)");
-  cm = cb->addMethod("getFaceByTag",&GModel::getFaceByTag);
+  cm = cb->addMethod("getFaceByTag", &GModel::getFaceByTag);
   cm->setDescription("access a geometrical face by tag");
-  cm->setArgNames("tag",NULL);
-  cm = cb->addMethod("getEdgeByTag",&GModel::getEdgeByTag);
+  cm->setArgNames("tag", NULL);
+  cm = cb->addMethod("getEdgeByTag", &GModel::getEdgeByTag);
   cm->setDescription("access a geometrical edge by tag");
-  cm->setArgNames("tag",NULL);
-  cm = cb->addMethod("getVertexByTag",&GModel::getVertexByTag);
+  cm->setArgNames("tag", NULL);
+  cm = cb->addMethod("getVertexByTag", &GModel::getVertexByTag);
   cm->setDescription("access a geometrical vertex by tag");
   cm->setArgNames("tag",NULL);
-  cm = cb->addMethod("getRegionByTag",&GModel::getRegionByTag);
+  cm = cb->addMethod("getRegionByTag", &GModel::getRegionByTag);
   cm->setDescription("access a geometrical region by tag");
-  cm->setArgNames("tag",NULL);
+  cm->setArgNames("tag", NULL);
   cm = cb->setConstructor<GModel>();
   cm->setDescription("Create an empty GModel");
 }
diff --git a/Geo/GModelIO_OCC.h b/Geo/GModelIO_OCC.h
index 248b079a81cd897e3a6767550df76e5afc874d81..e14548265179e968eb74ac7c4bef31f2fcf395bc 100644
--- a/Geo/GModelIO_OCC.h
+++ b/Geo/GModelIO_OCC.h
@@ -13,13 +13,6 @@
 #if defined(HAVE_OCC)
 #include <vector>
 
-class OCC_Options {
- private:
-  int _dummy;
- public:
-  OCC_Options(int dummy) : _dummy(dummy){}
-};
-
 class OCC_Internals {
  protected :
   TopoDS_Shape shape;
diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp
index 77d8c51b8436a2ddf8d115c604a1a969150c319d..92c787de6d3ce8af1a3568bcd711dbffb714986c 100644
--- a/Geo/MVertex.cpp
+++ b/Geo/MVertex.cpp
@@ -416,8 +416,8 @@ void MVertex::registerBindings(binding *b)
   cm->setDescription("Return the z-coordinate.");
   cm = cb->addMethod("setXYZ", &MVertex::setXYZ);
   cm->setDescription("set the coordinates");
-  cm->setArgNames("x","y","z",NULL);
+  cm->setArgNames("x", "y", "z",NULL);
   cm = cb->setConstructor<MVertex,double,double,double>();
-  cm->setArgNames("x","y","z",NULL);
+  cm->setArgNames("x", "y", "z", NULL);
   cm->setDescription("Create a new mesh vertex at (x,y,z).");
 }