diff --git a/src/libstl/stl_error.h b/src/libstl/stl_error.h
index c231bab..2d55653 100644
--- a/src/libstl/stl_error.h
+++ b/src/libstl/stl_error.h
@@ -2,6 +2,7 @@
 #define FOUG_LIBSTL_STL_ERROR_H
 
 #define FOUG_STL_ERROR_TAG          0x11000000
+
 /* Specific error codes returned by foug_stla_read() */
 #define FOUG_STLA_READ_PARSE_ERROR  (FOUG_STL_ERROR_TAG + 1)
 
@@ -10,7 +11,7 @@
 #define FOUG_STLA_WRITE_INVALID_REAL32_PRECISION (FOUG_STL_ERROR_TAG + 101)
 
 /* Specific error code common to foug_stlb_read() and foug_stlb_write() */
-#define FOUG_STLB_READWRITE_UNSUPPORTED_BYTE_ORDER    (FOUG_STL_ERROR_TAG + 200)
+#define FOUG_STLB_READWRITE_UNSUPPORTED_BYTE_ORDER (FOUG_STL_ERROR_TAG + 200)
 
 /* Specific error codes returned by foug_stlb_read() */
 #define FOUG_STLB_READ_HEADER_WRONG_SIZE_ERROR   (FOUG_STL_ERROR_TAG + 300)
diff --git a/src/libstl/stlb_write.c b/src/libstl/stlb_write.c
index 0895ac3..8ac0675 100644
--- a/src/libstl/stlb_write.c
+++ b/src/libstl/stlb_write.c
@@ -37,14 +37,13 @@ static void foug_stlb_write_facets(const foug_stlb_geom_output_t* geom,
   const uint32_t facet_count = wparams->facet_count;
   const uint32_t i_facet_offset = wparams->i_facet_offset;
   foug_stlb_triangle_t triangle;
-  uint32_t buffer_offset;
-  uint32_t i_facet;
+  uint32_t buffer_offset = 0;
+  uint32_t i_facet = 0;
 
   if (geom == NULL || geom->get_triangle_func == NULL)
     return;
 
   triangle.attribute_byte_count = 0;
-  buffer_offset = 0;
   for (i_facet = i_facet_offset; i_facet < (i_facet_offset + facet_count); ++i_facet) {
     geom->get_triangle_func(geom->cookie, i_facet, &triangle.data);
     if (geom->get_attr_byte_count_func != NULL)