diff --git a/src/cli/src/main.cpp b/src/cli/src/main.cpp
index 2263a5c..c169f8f 100644
--- a/src/cli/src/main.cpp
+++ b/src/cli/src/main.cpp
@@ -34,8 +34,7 @@
 #include <vector>
 
 
-namespace
-{
+namespace {
 
     struct ValidationModeData
     {
diff --git a/src/gui/src/draw_grid.cpp b/src/gui/src/draw_grid.cpp
index 50c56f1..87973c6 100644
--- a/src/gui/src/draw_grid.cpp
+++ b/src/gui/src/draw_grid.cpp
@@ -4,10 +4,8 @@
 #include <vector>
 
 
-namespace picross_grid
-{
-namespace
-{
+namespace picross_grid {
+namespace {
     // Grid background
     constexpr ImU32 ColorGridBack = IM_COL32(255, 255, 255, 255);
     constexpr ImU32 ColorGridOutline = IM_COL32(224, 224, 224, 255);
@@ -128,7 +126,7 @@ namespace
         }
     }
 
-} // Anonymous namespace
+} // namespace
 
 
 size_t get_tile_size(int size_enum)
diff --git a/src/gui/src/draw_grid.h b/src/gui/src/draw_grid.h
index b902b36..23039a5 100644
--- a/src/gui/src/draw_grid.h
+++ b/src/gui/src/draw_grid.h
@@ -9,8 +9,7 @@
 
 #include <cstddef>
 
-namespace picross_grid
-{
+namespace picross_grid {
 
 size_t get_tile_size(int size_enum);
 void draw_background_grid(ImDrawList* draw_list, ImVec2 tl_corner, size_t tile_size, size_t width, size_t height, bool outline = false, bool five_tile_outline = false);
diff --git a/src/gui/src/glfw_context.cpp b/src/gui/src/glfw_context.cpp
index d37a758..de9b715 100644
--- a/src/gui/src/glfw_context.cpp
+++ b/src/gui/src/glfw_context.cpp
@@ -4,8 +4,7 @@
 #include <GLFW/glfw3.h>
 
 
-namespace
-{
+namespace {
 
 constexpr int TARGET_OPENGL_MAJOR = 3;
 constexpr int TARGET_OPENGL_MINOR = 0;
@@ -23,7 +22,7 @@ void glfw_error_callback(int error, const char* description)
     s_glfw_err_handler(stdutils::io::Severity::ERR, out.str());
 }
 
-} // Anonymous namespace
+} // namespace
 
 GLFWWindowContext::GLFWWindowContext(int width, int height, const std::string_view& title, const stdutils::io::ErrorHandler* err_handler)
     : m_window_ptr(nullptr)
diff --git a/src/gui/src/grid_info.cpp b/src/gui/src/grid_info.cpp
index 3847aa9..5ed684b 100644
--- a/src/gui/src/grid_info.cpp
+++ b/src/gui/src/grid_info.cpp
@@ -15,8 +15,7 @@
 #include <utility>
 
 
-namespace
-{
+namespace {
     constexpr std::string_view GRID_INFO = "Grid Info";
     constexpr std::string_view SOLVER_STATS = "Solver Stats";
     constexpr std::string_view GRID_CONSTRAINTS = "Grid Constraints";
@@ -236,8 +235,7 @@ void GridInfo::refresh_stats_info()
     solver_stats_flag = false;
 }
 
-namespace
-{
+namespace {
     std::size_t key_col_width(const GridInfo::InfoMap& map)
     {
         std::size_t result = 0;
diff --git a/src/gui/src/imgui_helpers.cpp b/src/gui/src/imgui_helpers.cpp
index 2d3c096..ccd0341 100644
--- a/src/gui/src/imgui_helpers.cpp
+++ b/src/gui/src/imgui_helpers.cpp
@@ -7,8 +7,7 @@
 #include "glfw_context.h"
 
 
-namespace ImGui
-{
+namespace ImGui {
 
 void HelpMarker(const char* desc)
 {
diff --git a/src/gui/src/imgui_helpers.h b/src/gui/src/imgui_helpers.h
index 3246eb7..25fdcc9 100644
--- a/src/gui/src/imgui_helpers.h
+++ b/src/gui/src/imgui_helpers.h
@@ -22,8 +22,7 @@ inline ImVec2 to_imgui_vec2(ScreenPos pos)
     return ImVec2(pos.x, pos.y);
 }
 
-namespace ImGui
-{
+namespace ImGui {
 void HelpMarker(const char* desc);          // Function taken from imgui_demo.cpp
 void SetNextWindowPosAndSize(const WindowLayout& window_layout, ImGuiCond cond = 0);
 }
diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp
index ab697d4..695ffb1 100644
--- a/src/gui/src/main.cpp
+++ b/src/gui/src/main.cpp
@@ -35,8 +35,7 @@
 #include <vector>
 
 
-namespace
-{
+namespace {
 
 void err_callback(stdutils::io::SeverityCode sev, std::string_view msg)
 {
@@ -121,7 +120,7 @@ void main_menu_bar(AppWindows& windows, bool& application_should_close, bool& gu
     }
 }
 
-} // Anonymous namespace
+} // namespace
 
 
 int main(int argc, char *argv[])
diff --git a/src/gui/src/settings.cpp b/src/gui/src/settings.cpp
index 6e9c920..252a596 100644
--- a/src/gui/src/settings.cpp
+++ b/src/gui/src/settings.cpp
@@ -3,8 +3,7 @@
 #include <cassert>
 #include <limits>
 
-namespace
-{
+namespace {
 
     Settings::TileLimits tile_settings_limits()
     {
@@ -61,7 +60,7 @@ namespace
         return result;
     }
 
-}  // Anonymous namespace
+}  // namespace
 
 Settings::Settings()
 {
diff --git a/src/gui/src/style.cpp b/src/gui/src/style.cpp
index ca29afd..d866202 100644
--- a/src/gui/src/style.cpp
+++ b/src/gui/src/style.cpp
@@ -3,8 +3,7 @@
 #include <imgui_wrap.h>
 
 
-namespace
-{
+namespace {
     constexpr ImColor WindowBackgroundColor_Classic(29, 75, 99, 217);
     constexpr ImColor WindowBackgroundColor_Dark(4, 8, 25, 240);
     constexpr ImColor WindowMainBackgroundColor_Classic(35, 92, 121, 255);
diff --git a/src/picross/include/picross/picross.h b/src/picross/include/picross/picross.h
index e96fde1..b449e05 100644
--- a/src/picross/include/picross/picross.h
+++ b/src/picross/include/picross/picross.h
@@ -23,9 +23,7 @@
 #include <string_view>
 #include <vector>
 
-
-namespace picross
-{
+namespace picross {
 
 /*
  * Get the version of the library
diff --git a/src/picross/include/picross/picross_input_grid.h b/src/picross/include/picross/picross_input_grid.h
index 684c062..c44e75b 100644
--- a/src/picross/include/picross/picross_input_grid.h
+++ b/src/picross/include/picross/picross_input_grid.h
@@ -16,9 +16,7 @@
 #include <utility>
 #include <vector>
 
-
-namespace picross
-{
+namespace picross {
 
 /*
  * InputGrid class
diff --git a/src/picross/include/picross/picross_io.h b/src/picross/include/picross/picross_io.h
index bb3c343..d8ebd64 100644
--- a/src/picross/include/picross/picross_io.h
+++ b/src/picross/include/picross/picross_io.h
@@ -18,9 +18,7 @@
 #include <string_view>
 #include <vector>
 
-
-namespace picross
-{
+namespace picross {
 
 /*
  * IOGrid class
@@ -38,8 +36,7 @@ struct IOGrid
     std::optional<OutputGrid> m_goal;
 };
 
-namespace io
-{
+namespace io {
 
 /*
  * IO error handling
diff --git a/src/picross/include/picross/picross_observer.h b/src/picross/include/picross/picross_observer.h
index b613a30..9e500d9 100644
--- a/src/picross/include/picross/picross_observer.h
+++ b/src/picross/include/picross/picross_observer.h
@@ -14,9 +14,7 @@
 #include <ostream>
 #include <string>
 
-
-namespace picross
-{
+namespace picross {
 
 //
 // The observer is a function object with the following signature:
diff --git a/src/picross/include/picross/picross_output_grid.h b/src/picross/include/picross/picross_output_grid.h
index f9fddb2..cea4188 100644
--- a/src/picross/include/picross/picross_output_grid.h
+++ b/src/picross/include/picross/picross_output_grid.h
@@ -15,8 +15,7 @@
 #include <string>
 #include <vector>
 
-namespace picross
-{
+namespace picross {
 
 /*
  * A tile is the base element to construct lines and grids: it can be empty or filled
diff --git a/src/picross/include/picross/picross_stats.h b/src/picross/include/picross/picross_stats.h
index ea6281e..f836ff8 100644
--- a/src/picross/include/picross/picross_stats.h
+++ b/src/picross/include/picross/picross_stats.h
@@ -12,9 +12,7 @@
 #include <ostream>
 #include <vector>
 
-
-namespace picross
-{
+namespace picross {
 
 /*
  * GridStats
diff --git a/src/picross/src/binomial.cpp b/src/picross/src/binomial.cpp
index 6d5b720..afa3b31 100644
--- a/src/picross/src/binomial.cpp
+++ b/src/picross/src/binomial.cpp
@@ -7,10 +7,8 @@
 
 #include <cstddef>
 
-namespace picross
-{
-namespace BinomialCoefficients
-{
+namespace picross {
+namespace binomial {
 
 Rep Cache::partition_n_elts_into_k_buckets(unsigned int nb_elts, unsigned int nb_buckets)
 {
@@ -55,5 +53,5 @@ Rep Cache::partition_n_elts_into_k_buckets(unsigned int nb_elts, unsigned int nb
     return binomial_number;
 }
 
-} // namespace BinomialCoefficients
+} // namespace binomial
 } // namespace picross
diff --git a/src/picross/src/binomial.h b/src/picross/src/binomial.h
index a23ab85..7d9f2bd 100644
--- a/src/picross/src/binomial.h
+++ b/src/picross/src/binomial.h
@@ -12,10 +12,9 @@
 #include <limits>
 #include <vector>
 
-namespace picross
-{
-namespace BinomialCoefficients
-{
+namespace picross {
+namespace binomial {
+
 using Rep = std::uint32_t;
 
 /*
@@ -82,5 +81,5 @@ class Cache
     std::vector<Rep> binomial_numbers;
 };
 
-} // namespace BinomialCoefficients
+} // namespace binomial
 } // namespace picross
diff --git a/src/picross/src/grid.cpp b/src/picross/src/grid.cpp
index ece97d0..18024a5 100644
--- a/src/picross/src/grid.cpp
+++ b/src/picross/src/grid.cpp
@@ -14,13 +14,10 @@
 #include <utility>
 
 
-namespace picross
-{
+namespace picross {
 
-namespace
-{
-namespace Tiles
-{
+namespace {
+namespace Tiles {
     inline bool set(Tile& t, Tile val)
     {
         const bool changed = (val != t);
diff --git a/src/picross/src/grid.h b/src/picross/src/grid.h
index eee7881..5ee043a 100644
--- a/src/picross/src/grid.h
+++ b/src/picross/src/grid.h
@@ -15,9 +15,8 @@
 #include <string_view>
 #include <vector>
 
+namespace picross {
 
-namespace picross
-{
 class Grid
 {
 public:
@@ -99,5 +98,4 @@ class GridSnapshot
     Grid::Container         m_tiles;
 };
 
-
 } // namespace picross
diff --git a/src/picross/src/input_grid.cpp b/src/picross/src/input_grid.cpp
index ddbbaac..cf93632 100644
--- a/src/picross/src/input_grid.cpp
+++ b/src/picross/src/input_grid.cpp
@@ -9,9 +9,7 @@
 
 #include <sstream>
 
-
-namespace picross
-{
+namespace picross {
 
 InputGrid::InputGrid(const Constraints& rows, const Constraints& cols, const std::string_view name)
     : m_rows(rows)
@@ -99,4 +97,4 @@ std::pair<bool, std::string> check_input_grid(const InputGrid& grid)
     return std::make_pair(true, std::string());
 }
 
-} // namespace picross
\ No newline at end of file
+} // namespace picross
diff --git a/src/picross/src/line.cpp b/src/picross/src/line.cpp
index 28cbb1a..2300b25 100644
--- a/src/picross/src/line.cpp
+++ b/src/picross/src/line.cpp
@@ -16,9 +16,7 @@
 #include <string>
 #include <vector>
 
-
-namespace picross
-{
+namespace picross {
 
 Line::Line(Line::Type type, Line::Index index, size_t size, Tile init_tile) :
     m_type(type),
diff --git a/src/picross/src/line.h b/src/picross/src/line.h
index 77a022d..e40a4c3 100644
--- a/src/picross/src/line.h
+++ b/src/picross/src/line.h
@@ -13,9 +13,7 @@
 
 #include <cassert>
 
-
-namespace picross
-{
+namespace picross {
 
 /*
  * Line range
diff --git a/src/picross/src/line_alternatives.cpp b/src/picross/src/line_alternatives.cpp
index 4519dcf..d56343e 100644
--- a/src/picross/src/line_alternatives.cpp
+++ b/src/picross/src/line_alternatives.cpp
@@ -22,10 +22,8 @@
 #include <type_traits>
 #include <utility>
 
-namespace picross
-{
-namespace
-{
+namespace picross {
+namespace {
     template <bool Reversed>
     struct IndexTranslation
     {
@@ -235,8 +233,7 @@ std::vector<LineHole> line_holes(const LineSpan& known_tiles, int line_begin, in
 }
 
 
-namespace
-{
+namespace {
     std::pair<bool, std::vector<SegmentRange>> local_find_segments_range(const LineSpan& known_tiles, const BidirectionalRange<false>& range)
     {
         const auto nb_segments = static_cast<std::size_t>(std::distance(range.m_constraint_begin, range.m_constraint_end));
@@ -425,7 +422,7 @@ namespace
 
 struct LineAlternatives::Impl
 {
-    Impl(const LineConstraint& constraint, const LineSpan& known_tiles, BinomialCoefficients::Cache& binomial);
+    Impl(const LineConstraint& constraint, const LineSpan& known_tiles, binomial::Cache& binomial);
     Impl(const Impl& other, const LineSpan& known_tiles);
 
     void reset();
@@ -467,14 +464,14 @@ struct LineAlternatives::Impl
     const LineSpan                      m_known_tiles;
     LineExt                             m_known_tiles_extended_copy;
     const LineSpan                      m_known_tiles_ext;
-    BinomialCoefficients::Cache&        m_binomial;
+    binomial::Cache&                    m_binomial;
     const unsigned int                  m_line_length;
     unsigned int                        m_remaining_zeros;
     BidirectionalRange<false>           m_bidirectional_range;
     BidirectionalRange<true>            m_bidirectional_range_reverse;
 };
 
-LineAlternatives::Impl::Impl(const LineConstraint& constraints, const LineSpan& known_tiles, BinomialCoefficients::Cache& binomial)
+LineAlternatives::Impl::Impl(const LineConstraint& constraints, const LineSpan& known_tiles, binomial::Cache& binomial)
     : m_segments(constraints.segments())
     , m_known_tiles(known_tiles)
     , m_known_tiles_extended_copy(known_tiles)
@@ -777,7 +774,7 @@ LineAlternatives::Reduction LineAlternatives::Impl::linear_reduction(const std::
             for (int idx = max_index; idx < min_index + static_cast<int>(seg_length); idx++)
                 reduction_mask[idx] = Tile::FILLED;
         }
-        BinomialCoefficients::mult(result.nb_alternatives, nb_alt);
+        binomial::mult(result.nb_alternatives, nb_alt);
         if (result.nb_alternatives == 0)
             break;
         constraint_it++;
@@ -833,7 +830,7 @@ TailReduce LineAlternatives::Impl::reduce_all_alternatives_recursive(
     const int line_begin,
     const int line_end)
 {
-    static_assert(std::is_same_v<NbAlt, BinomialCoefficients::Rep>);
+    static_assert(std::is_same_v<NbAlt, binomial::Rep>);
     assert(constraint_it != constraint_end);
     const auto k = static_cast<unsigned int>(std::distance(constraint_it, constraint_end)) - 1;
 
@@ -886,7 +883,7 @@ TailReduce LineAlternatives::Impl::reduce_all_alternatives_recursive(
                 nb_alt++;
             }
         }
-        BinomialCoefficients::add(result.m_nb_alt, nb_alt);
+        binomial::add(result.m_nb_alt, nb_alt);
     }
     else
     {
@@ -910,7 +907,7 @@ TailReduce LineAlternatives::Impl::reduce_all_alternatives_recursive(
                         alternative_tail[next_line_idx + idx] = recurse_tail_reduce.m_reduced_tail[idx];
                     }
                     reduced_line_tail.reduce(alternative_tail);
-                    BinomialCoefficients::add(result.m_nb_alt, recurse_tail_reduce.m_nb_alt);
+                    binomial::add(result.m_nb_alt, recurse_tail_reduce.m_nb_alt);
                 }
             }
         }
@@ -966,7 +963,7 @@ LineAlternatives::Reduction LineAlternatives::Impl::reduce_all_alternatives(Full
 }
 
 
-LineAlternatives::LineAlternatives(const LineConstraint& constraint, const LineSpan& known_tiles, BinomialCoefficients::Cache& binomial)
+LineAlternatives::LineAlternatives(const LineConstraint& constraint, const LineSpan& known_tiles, binomial::Cache& binomial)
     : p_impl(std::make_unique<Impl>(constraint, known_tiles, binomial))
 {
 }
diff --git a/src/picross/src/line_alternatives.h b/src/picross/src/line_alternatives.h
index e3920e3..a9b0fc5 100644
--- a/src/picross/src/line_alternatives.h
+++ b/src/picross/src/line_alternatives.h
@@ -14,9 +14,10 @@
 #include <ostream>
 #include <vector>
 
-namespace picross
-{
-namespace BinomialCoefficients { class Cache; }
+namespace picross {
+
+namespace binomial { class Cache; }
+
 class LineConstraint;
 
 struct LineHole
@@ -50,7 +51,7 @@ class LineAlternatives
 public:
     using NbAlt = std::uint32_t;
 public:
-    LineAlternatives(const LineConstraint& constraint, const LineSpan& known_tiles, BinomialCoefficients::Cache& binomial);
+    LineAlternatives(const LineConstraint& constraint, const LineSpan& known_tiles, binomial::Cache& binomial);
     LineAlternatives(const LineAlternatives& other, const LineSpan& known_tiles);
     ~LineAlternatives();
     // Movable
@@ -90,4 +91,4 @@ struct FullReductionBuffers
     std::vector<char>                       m_bool_buffer;
 };
 
-} // namespace picross
\ No newline at end of file
+} // namespace picross
diff --git a/src/picross/src/line_cache.cpp b/src/picross/src/line_cache.cpp
index 102f4a6..c607a83 100644
--- a/src/picross/src/line_cache.cpp
+++ b/src/picross/src/line_cache.cpp
@@ -14,9 +14,8 @@
 #include <type_traits>
 #include <vector>
 
+namespace picross {
 
-namespace picross
-{
 constexpr TileImpl TILE_INVALID_CACHE_ENTRY { 0xFF };
 
 static_assert(
@@ -117,4 +116,4 @@ void LineCache::clear()
     p_impl->m_cache_1.clear();
 }
 
-} // namespace picross
\ No newline at end of file
+} // namespace picross
diff --git a/src/picross/src/line_cache.h b/src/picross/src/line_cache.h
index 70d8a43..cdf658c 100644
--- a/src/picross/src/line_cache.h
+++ b/src/picross/src/line_cache.h
@@ -16,8 +16,7 @@
 #include <cstddef>
 #include <memory>
 
-namespace picross
-{
+namespace picross {
 
 class LineCache
 {
@@ -44,4 +43,4 @@ class LineCache
     std::unique_ptr<Impl> p_impl;
 };
 
-} // namespace picross
\ No newline at end of file
+} // namespace picross
diff --git a/src/picross/src/line_constraint.cpp b/src/picross/src/line_constraint.cpp
index 308bfe5..9713e5d 100644
--- a/src/picross/src/line_constraint.cpp
+++ b/src/picross/src/line_constraint.cpp
@@ -11,9 +11,7 @@
 #include <algorithm>
 #include <cassert>
 
-
-namespace picross
-{
+namespace picross {
 
 unsigned int compute_min_line_size(const Segments& segments)
 {
@@ -47,7 +45,7 @@ unsigned int LineConstraint::max_segment_size() const
 }
 
 // Given an uninitialized line compute the theoritical number of alternatives
-unsigned int LineConstraint::line_trivial_nb_alternatives(unsigned int line_size, BinomialCoefficients::Cache& binomial_cache) const
+unsigned int LineConstraint::line_trivial_nb_alternatives(unsigned int line_size, binomial::Cache& binomial_cache) const
 {
     if (line_size < m_min_line_size)
     {
diff --git a/src/picross/src/line_constraint.h b/src/picross/src/line_constraint.h
index 0eae7d3..b650185 100644
--- a/src/picross/src/line_constraint.h
+++ b/src/picross/src/line_constraint.h
@@ -19,9 +19,8 @@
 #include <utility>
 #include <vector>
 
+namespace picross {
 
-namespace picross
-{
 using Segments = std::vector<unsigned int>;
 
 template <typename SegmentIt>
@@ -33,13 +32,13 @@ unsigned int compute_min_line_size(SegmentIt begin, SegmentIt end)
 
 unsigned int compute_min_line_size(const Segments& segments);
 
-inline BinomialCoefficients::Rep compute_max_nb_of_alternatives(unsigned int nb_extra_zeros, unsigned int nb_segments, BinomialCoefficients::Cache& binomial)
+inline binomial::Rep compute_max_nb_of_alternatives(unsigned int nb_extra_zeros, unsigned int nb_segments, binomial::Cache& binomial)
 {
     return nb_extra_zeros > 0 ? binomial.partition_n_elts_into_k_buckets(nb_extra_zeros, nb_segments + 1) : 1u;
 }
 
 template <typename SegmentIt>
-BinomialCoefficients::Rep compute_max_nb_of_alternatives(unsigned int extra_zeros, SegmentIt begin, SegmentIt end, BinomialCoefficients::Cache& binomial)
+binomial::Rep compute_max_nb_of_alternatives(unsigned int extra_zeros, SegmentIt begin, SegmentIt end, binomial::Cache& binomial)
 {
     const unsigned int nb_segments = static_cast<unsigned int>(std::distance(begin, end));
     return compute_max_nb_of_alternatives(extra_zeros, nb_segments, binomial);
@@ -54,7 +53,7 @@ class LineConstraint
     std::size_t nb_segments() const { return m_segments.size(); }
     const Segments& segments() const { return m_segments; }
     unsigned int min_line_size() const { return m_min_line_size; }
-    unsigned int line_trivial_nb_alternatives(unsigned int line_size, BinomialCoefficients::Cache& binomial) const;
+    unsigned int line_trivial_nb_alternatives(unsigned int line_size, binomial::Cache& binomial) const;
     Line line_trivial_reduction(unsigned int line_size, unsigned int index) const;
     std::vector<Line> build_all_possible_lines(const LineSpan& known_tiles) const;
     bool compatible(const LineSpan& line) const;
diff --git a/src/picross/src/line_span.cpp b/src/picross/src/line_span.cpp
index a20fce6..0e18cad 100644
--- a/src/picross/src/line_span.cpp
+++ b/src/picross/src/line_span.cpp
@@ -9,13 +9,10 @@
 #include <cassert>
 #include <sstream>
 
-namespace picross
-{
+namespace picross {
 
-namespace
-{
-namespace Tiles
-{
+namespace {
+namespace Tiles {
     char str(Tile t)
     {
         if (t == Tile::UNKNOWN) { return '?'; }
diff --git a/src/picross/src/line_span.h b/src/picross/src/line_span.h
index 4701f18..aec8cf0 100644
--- a/src/picross/src/line_span.h
+++ b/src/picross/src/line_span.h
@@ -12,9 +12,7 @@
 #include <cstddef>
 #include <type_traits>
 
-
-namespace picross
-{
+namespace picross {
 
 template <typename TileT>
 class LineSpanImpl
diff --git a/src/picross/src/output_grid.cpp b/src/picross/src/output_grid.cpp
index 5ef000f..1fc243f 100644
--- a/src/picross/src/output_grid.cpp
+++ b/src/picross/src/output_grid.cpp
@@ -11,8 +11,7 @@
 #include <cassert>
 #include <exception>
 
-namespace picross
-{
+namespace picross {
 
 OutputGrid::OutputGrid(std::size_t width, std::size_t height, Tile init_tile, const std::string& name)
     : p_grid(std::make_unique<Grid>(width, height, init_tile, name))
diff --git a/src/picross/src/output_grid_utils.cpp b/src/picross/src/output_grid_utils.cpp
index f7d6d30..8084bb9 100644
--- a/src/picross/src/output_grid_utils.cpp
+++ b/src/picross/src/output_grid_utils.cpp
@@ -14,8 +14,7 @@
 #include <exception>
 #include <sstream>
 
-namespace picross
-{
+namespace picross {
 
 std::string str_output_grid_size(const OutputGrid& grid)
 {
@@ -24,8 +23,7 @@ std::string str_output_grid_size(const OutputGrid& grid)
     return oss.str();
 }
 
-namespace
-{
+namespace {
     template <typename NonMatching>
     void match_output_grid_against_input_grid(const InputGrid& input_grid, const OutputGrid& output_grid, const NonMatching& non_matching)
     {
diff --git a/src/picross/src/picross_io.cpp b/src/picross/src/picross_io.cpp
index e555ef7..fd28b74 100644
--- a/src/picross/src/picross_io.cpp
+++ b/src/picross/src/picross_io.cpp
@@ -18,9 +18,7 @@
 #include <iterator>
 #include <sstream>
 
-
-namespace picross
-{
+namespace picross {
 
 IOGrid::IOGrid(const InputGrid& input_grid, const std::optional<OutputGrid>& goal)
     : m_input_grid(input_grid)
@@ -32,8 +30,7 @@ IOGrid::IOGrid(InputGrid&& input_grid, std::optional<OutputGrid>&& goal) noexcep
     , m_goal(std::move(goal))
 {}
 
-namespace io
-{
+namespace io {
 
 std::string str_error_code(ErrorCodeT code)
 {
@@ -60,8 +57,7 @@ std::string str_error_code(ErrorCodeT code)
     }
 }
 
-namespace
-{
+namespace {
 
 struct FileFormat
 {
@@ -710,7 +706,7 @@ void write_goal_non_format(std::ostream& out, const OutputGrid& goal)
     out << quote << std::endl;
 }
 
-} // Anonymous namespace
+} // namespace
 
 
 std::vector<IOGrid> parse_input_file_native(std::string_view filepath, const ErrorHandler& error_handler) noexcept
diff --git a/src/picross/src/picross_solver_version.cpp b/src/picross/src/picross_solver_version.cpp
index 14b7d10..dfcf453 100644
--- a/src/picross/src/picross_solver_version.cpp
+++ b/src/picross/src/picross_solver_version.cpp
@@ -7,9 +7,7 @@
 
 #include "picross_solver_version.h"
 
-
-namespace picross
-{
+namespace picross {
 
 std::string_view get_version_string()
 {
diff --git a/src/picross/src/picross_stats.cpp b/src/picross/src/picross_stats.cpp
index 84f4acc..f348827 100644
--- a/src/picross/src/picross_stats.cpp
+++ b/src/picross/src/picross_stats.cpp
@@ -12,9 +12,7 @@
 #include <cassert>
 #include <cstddef>
 
-
-namespace picross
-{
+namespace picross {
 
 DifficultyCode difficulty_code(const GridStats& grid_stats)
 {
@@ -77,7 +75,7 @@ std::ostream& operator<<(std::ostream& out, const GridStats& stats)
     }
 
     out << "Max number of alternatives on an empty line (initial grid pass): " << stats.max_initial_nb_alternatives;
-    if (stats.max_initial_nb_alternatives == BinomialCoefficients::overflowValue()) { out << " (overflow!)"; }
+    if (stats.max_initial_nb_alternatives == binomial::overflowValue()) { out << " (overflow!)"; }
     out << std::endl;
 
     if (stats.max_nb_alternatives_partial_w_change > 0 || stats.max_nb_alternatives_partial)
diff --git a/src/picross/src/picross_stats_internal.h b/src/picross/src/picross_stats_internal.h
index 28e4ad4..621b725 100644
--- a/src/picross/src/picross_stats_internal.h
+++ b/src/picross/src/picross_stats_internal.h
@@ -9,9 +9,7 @@
 
 #include <cassert>
 
-
-namespace picross
-{
+namespace picross {
 
 void merge_branching_grid_stats(GridStats& stats, const GridStats& branching_stats);
 
diff --git a/src/picross/src/solver.cpp b/src/picross/src/solver.cpp
index b6e9b29..47c29f8 100644
--- a/src/picross/src/solver.cpp
+++ b/src/picross/src/solver.cpp
@@ -19,9 +19,7 @@
 #include <string>
 #include <utility>
 
-
-namespace picross
-{
+namespace picross {
 
 template <bool BranchingAllowed>
 Solver::Result RefSolver<BranchingAllowed>::solve(const InputGrid& input_grid, unsigned int max_nb_solutions) const
diff --git a/src/picross/src/solver.h b/src/picross/src/solver.h
index 2118658..43be510 100644
--- a/src/picross/src/solver.h
+++ b/src/picross/src/solver.h
@@ -9,9 +9,7 @@
 
 #include <picross/picross.h>
 
-
-namespace picross
-{
+namespace picross {
 
 /*
  * Grid Solver: an implementation
diff --git a/src/picross/src/solver_policy.cpp b/src/picross/src/solver_policy.cpp
index ea6d3b4..e8ff510 100644
--- a/src/picross/src/solver_policy.cpp
+++ b/src/picross/src/solver_policy.cpp
@@ -11,8 +11,7 @@
 #include <cassert>
 #include <limits>
 
-namespace picross
-{
+namespace picross {
 
 unsigned int SolverPolicy_RampUpMaxNbAlternatives::get_max_nb_alternatives(unsigned int previous_max_nb_alternatives, bool grid_changed, unsigned int skipped_lines) const
 {
diff --git a/src/picross/src/solver_policy.h b/src/picross/src/solver_policy.h
index 0f95278..eb0cfc2 100644
--- a/src/picross/src/solver_policy.h
+++ b/src/picross/src/solver_policy.h
@@ -5,8 +5,7 @@
  ******************************************************************************/
 #pragma once
 
-namespace picross
-{
+namespace picross {
 
 struct SolverPolicyBase
 {
diff --git a/src/picross/src/work_grid.cpp b/src/picross/src/work_grid.cpp
index ade44c2..3c1ab91 100644
--- a/src/picross/src/work_grid.cpp
+++ b/src/picross/src/work_grid.cpp
@@ -24,16 +24,13 @@
 #include <optional>
 #include <type_traits>
 
-
-namespace picross
-{
+namespace picross {
 
 // Exception returned by WorkGrid::solve() if the processing was aborted from the outside
 class PicrossSolverAborted : public std::exception
 {};
 
-namespace
-{
+namespace {
 constexpr bool PARTIAL_SOLUTION = true;
 constexpr bool FULL_SOLUTION = false;
 
@@ -46,7 +43,7 @@ std::vector<LineConstraint> build_constraints_from(Line::Type type, const InputG
     return output;
 }
 
-std::vector<LineAlternatives> build_line_alternatives_from(Line::Type type, const std::vector<LineConstraint>& constraints, const Grid& grid, BinomialCoefficients::Cache& binomial)
+std::vector<LineAlternatives> build_line_alternatives_from(Line::Type type, const std::vector<LineConstraint>& constraints, const Grid& grid, binomial::Cache& binomial)
 {
     std::vector<LineAlternatives> output;
     output.reserve(constraints.size());
@@ -159,7 +156,7 @@ WorkGrid<SolverPolicy>::WorkGrid(const InputGrid& grid, const SolverPolicy& solv
     , m_nested_work_grid()
     , m_branch_line_cache()
     , m_full_reduction_buffers()
-    , m_binomial(std::make_shared<BinomialCoefficients::Cache>())
+    , m_binomial(std::make_shared<binomial::Cache>())
 {
     assert(m_binomial);
 
diff --git a/src/picross/src/work_grid.h b/src/picross/src/work_grid.h
index 637bf34..3525e4f 100644
--- a/src/picross/src/work_grid.h
+++ b/src/picross/src/work_grid.h
@@ -22,8 +22,7 @@
 #include <ostream>
 #include <vector>
 
-namespace picross
-{
+namespace picross {
 
 /*
  * State of the grid solver
@@ -131,7 +130,7 @@ class WorkGrid final : private Grid
     std::unique_ptr<WorkGrid<SolverPolicy>>         m_nested_work_grid;
     LineCache                                       m_branch_line_cache;
     std::shared_ptr<FullReductionBuffers>           m_full_reduction_buffers;
-    std::shared_ptr<BinomialCoefficients::Cache>    m_binomial;
+    std::shared_ptr<binomial::Cache>                m_binomial;
 };
 
 } // namespace picross
diff --git a/src/stdutils/include/stdutils/chrono.h b/src/stdutils/include/stdutils/chrono.h
index fa21059..18e95c8 100644
--- a/src/stdutils/include/stdutils/chrono.h
+++ b/src/stdutils/include/stdutils/chrono.h
@@ -4,11 +4,8 @@
 
 #include <chrono>
 
-
-namespace stdutils
-{
-namespace chrono
-{
+namespace stdutils {
+namespace chrono {
 
 template<typename Rep, typename Period>
 class DurationMeas
diff --git a/src/stdutils/include/stdutils/io.h b/src/stdutils/include/stdutils/io.h
index 986eef3..d39651b 100644
--- a/src/stdutils/include/stdutils/io.h
+++ b/src/stdutils/include/stdutils/io.h
@@ -12,11 +12,8 @@
 #include <string_view>
 #include <vector>
 
-
-namespace stdutils
-{
-namespace io
-{
+namespace stdutils {
+namespace io {
 
 /**
  * IO error handling
diff --git a/src/stdutils/include/stdutils/platform.h b/src/stdutils/include/stdutils/platform.h
index 6a8b46c..b3a4e83 100644
--- a/src/stdutils/include/stdutils/platform.h
+++ b/src/stdutils/include/stdutils/platform.h
@@ -5,11 +5,8 @@
 #include <ostream>
 #include <string>
 
-
-namespace stdutils
-{
-namespace platform
-{
+namespace stdutils {
+namespace platform {
 
 enum class OS
 {
@@ -54,5 +51,5 @@ void print_compilation_date(std::ostream& out);
 void print_platform_info(std::ostream& out);
 void print_compiler_all_info(std::ostream& out);
 
-}
-}
+} // namespace platform
+} // namespace stdutils
diff --git a/src/stdutils/include/stdutils/span.h b/src/stdutils/include/stdutils/span.h
index efa204c..a1ca3e8 100644
--- a/src/stdutils/include/stdutils/span.h
+++ b/src/stdutils/include/stdutils/span.h
@@ -7,9 +7,7 @@
 #include <limits>
 #include <type_traits>
 
-
-namespace stdutils
-{
+namespace stdutils {
 
 inline constexpr std::size_t dyn_extent = std::numeric_limits<std::size_t>::max();  // -1
 
@@ -80,5 +78,4 @@ class span<T, Sz, std::enable_if_t<Sz != dyn_extent>>
     T* m_ptr;
 };
 
-
-} // namespace stdutils
\ No newline at end of file
+} // namespace stdutils
diff --git a/src/stdutils/include/stdutils/string.h b/src/stdutils/include/stdutils/string.h
index 8010da4..44911a8 100644
--- a/src/stdutils/include/stdutils/string.h
+++ b/src/stdutils/include/stdutils/string.h
@@ -6,11 +6,8 @@
 #include <string>
 #include <string_view>
 
-
-namespace stdutils
-{
-namespace string
-{
+namespace stdutils {
+namespace string {
 
 std::string tolower(const std::string& in);
 
diff --git a/src/stdutils/src/io.cpp b/src/stdutils/src/io.cpp
index 6357be5..437bf0f 100644
--- a/src/stdutils/src/io.cpp
+++ b/src/stdutils/src/io.cpp
@@ -4,11 +4,8 @@
 
 #include <cassert>
 
-
-namespace stdutils
-{
-namespace io
-{
+namespace stdutils {
+namespace io {
 
 std::string_view str_severity_code(SeverityCode code)
 {
@@ -34,5 +31,5 @@ std::string_view str_severity_code(SeverityCode code)
     }
 }
 
-}
-}
+} // namespace io
+} // namespace stdutils
diff --git a/src/stdutils/src/platform.cpp b/src/stdutils/src/platform.cpp
index 2e58c75..d733b47 100644
--- a/src/stdutils/src/platform.cpp
+++ b/src/stdutils/src/platform.cpp
@@ -5,11 +5,8 @@
 #include <cassert>
 #include <sstream>
 
-
-namespace stdutils
-{
-namespace platform
-{
+namespace stdutils {
+namespace platform {
 
 constexpr OS os()
 {
diff --git a/src/stdutils/src/string.cpp b/src/stdutils/src/string.cpp
index 807f2b6..d7b61a9 100644
--- a/src/stdutils/src/string.cpp
+++ b/src/stdutils/src/string.cpp
@@ -5,11 +5,8 @@
 #include <algorithm>
 #include <cctype>
 
-
-namespace stdutils
-{
-namespace string
-{
+namespace stdutils {
+namespace string {
 
 std::string tolower(const std::string& in)
 {
diff --git a/src/tests/picross/src/bench_line_alternatives.cpp b/src/tests/picross/src/bench_line_alternatives.cpp
index 1aef914..b6ef0df 100644
--- a/src/tests/picross/src/bench_line_alternatives.cpp
+++ b/src/tests/picross/src/bench_line_alternatives.cpp
@@ -9,13 +9,11 @@
 #include "line_constraint.h"
 #include "line_span.h"
 
-namespace picross
-{
-namespace
-{
-    BinomialCoefficients::Cache& get_binomial()
+namespace picross {
+namespace {
+    binomial::Cache& get_binomial()
     {
-        static BinomialCoefficients::Cache binomial;
+        static binomial::Cache binomial;
         return binomial;
     }
 
diff --git a/src/tests/picross/src/bench_solver.cpp b/src/tests/picross/src/bench_solver.cpp
index 859f078..4f9d7f7 100644
--- a/src/tests/picross/src/bench_solver.cpp
+++ b/src/tests/picross/src/bench_solver.cpp
@@ -3,8 +3,7 @@
 #include <utils/text_io.h>
 
 
-namespace picross
-{
+namespace picross {
 
 TEST_CASE("Benchmark", "[solver]")
 {
diff --git a/src/tests/picross/src/test_binomial.cpp b/src/tests/picross/src/test_binomial.cpp
index f61e5cb..0c5cd4b 100644
--- a/src/tests/picross/src/test_binomial.cpp
+++ b/src/tests/picross/src/test_binomial.cpp
@@ -3,12 +3,11 @@
 #include "binomial.h"
 
 
-namespace picross
-{
+namespace picross {
 
 TEST_CASE("partition_n_elts_into_k_buckets", "[binomial]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     CHECK(binomial.partition_n_elts_into_k_buckets(3, 1) == 1);
     CHECK(binomial.partition_n_elts_into_k_buckets(1, 2) == 2);
     CHECK(binomial.partition_n_elts_into_k_buckets(3, 2) == 4);
@@ -17,8 +16,8 @@ TEST_CASE("partition_n_elts_into_k_buckets", "[binomial]")
 
 TEST_CASE("overflow", "[binomial]")
 {
-    BinomialCoefficients::Cache binomial;
-    constexpr auto MAX = BinomialCoefficients::overflowValue();
+    binomial::Cache binomial;
+    constexpr auto MAX = binomial::overflowValue();
     CHECK(binomial.partition_n_elts_into_k_buckets(24, 14) == 3562467300u);
     CHECK(binomial.partition_n_elts_into_k_buckets(23, 15) == MAX);
     CHECK(binomial.partition_n_elts_into_k_buckets(24, 15) == MAX);
@@ -26,49 +25,49 @@ TEST_CASE("overflow", "[binomial]")
 
 TEST_CASE("add", "[binomial]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     {
-        BinomialCoefficients::Rep nb_alternatives{0};
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(3, 2));
+        binomial::Rep nb_alternatives{0};
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(3, 2));
         CHECK(nb_alternatives == 4);
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(2, 2));
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(2, 2));
         CHECK(nb_alternatives == 7);
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(1, 2));
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(1, 2));
         CHECK(nb_alternatives == 9);
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(0, 2));
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(0, 2));
         CHECK(nb_alternatives == 10);
     }
     {
-        constexpr auto MAX = BinomialCoefficients::overflowValue();
-        BinomialCoefficients::Rep nb_alternatives{0};
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
+        constexpr auto MAX = binomial::overflowValue();
+        binomial::Rep nb_alternatives{0};
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
         CHECK(nb_alternatives == 1852482996u);
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
         CHECK(nb_alternatives == 2u * 1852482996u);
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
         CHECK(nb_alternatives == MAX);
-        BinomialCoefficients::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
+        binomial::add(nb_alternatives, binomial.partition_n_elts_into_k_buckets(25, 13));
         CHECK(nb_alternatives == MAX);
     }
 }
 
 TEST_CASE("mult", "[binomial]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     {
-        BinomialCoefficients::Rep nb_alternatives{1};
-        BinomialCoefficients::mult(nb_alternatives, 5);
+        binomial::Rep nb_alternatives{1};
+        binomial::mult(nb_alternatives, 5);
         CHECK(nb_alternatives == 5);
-        BinomialCoefficients::mult(nb_alternatives, 7);
+        binomial::mult(nb_alternatives, 7);
         CHECK(nb_alternatives == 35);
     }
     {
-        constexpr auto MAX = BinomialCoefficients::overflowValue();
-        BinomialCoefficients::Rep nb_alternatives{1};
+        constexpr auto MAX = binomial::overflowValue();
+        binomial::Rep nb_alternatives{1};
         for (unsigned int count = 0; count < 16; count++)
-             BinomialCoefficients::mult(nb_alternatives, 4);
+             binomial::mult(nb_alternatives, 4);
         CHECK(nb_alternatives == MAX);
-        BinomialCoefficients::mult(nb_alternatives, 3);
+        binomial::mult(nb_alternatives, 3);
         CHECK(nb_alternatives == MAX);
     }
 }
diff --git a/src/tests/picross/src/test_line_alternatives.cpp b/src/tests/picross/src/test_line_alternatives.cpp
index bf3bd0e..7831dc4 100644
--- a/src/tests/picross/src/test_line_alternatives.cpp
+++ b/src/tests/picross/src/test_line_alternatives.cpp
@@ -13,15 +13,13 @@
 #include <utility>
 
 
-namespace picross
-{
-namespace
-{
+namespace picross {
+namespace {
     inline constexpr unsigned int LINE_INDEX = 0;
 
-    BinomialCoefficients::Cache& get_binomial()
+    binomial::Cache& get_binomial()
     {
-        static BinomialCoefficients::Cache binomial;
+        static binomial::Cache binomial;
         return binomial;
     }
 
@@ -479,7 +477,7 @@ TEST_CASE("linear_reduction_non_regression_a", "[line_alternatives]")
 
 TEST_CASE("linear_vs_full_reduction", "[line_alternatives]")
 {
-    constexpr auto MAX = BinomialCoefficients::overflowValue();
+    constexpr auto MAX = binomial::overflowValue();
     {
         const LineConstraint constraint(Line::COL, { 7, 6, 9, 3, 3, 4, 4 });   // Example from tiger.non
         const auto known_tiles      = build_line_from("..????###?#???##???????######?###?#??????##???##??", Line::COL, 34);
diff --git a/src/tests/picross/src/test_line_constraint.cpp b/src/tests/picross/src/test_line_constraint.cpp
index 35f6816..fa03a70 100644
--- a/src/tests/picross/src/test_line_constraint.cpp
+++ b/src/tests/picross/src/test_line_constraint.cpp
@@ -5,10 +5,8 @@
 #include "line_constraint.h"
 
 
-namespace picross
-{
-namespace
-{
+namespace picross {
+namespace {
 inline constexpr unsigned int LINE_INDEX = 0;
 }
 
@@ -23,7 +21,7 @@ TEST_CASE("compute_min_line_size", "[line_constraint]")
 
 TEST_CASE("line_trivial_nb_alternatives", "[line_constraint]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     LineConstraint constraint(Line::ROW, { 1, 1 });
     CHECK_THROWS(constraint.line_trivial_nb_alternatives(0, binomial));
     CHECK_THROWS(constraint.line_trivial_nb_alternatives(1, binomial));
@@ -46,7 +44,7 @@ TEST_CASE("line_trivial_reduction", "[line_constraint]")
 
 TEST_CASE("empty_line", "[line_constraint]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     for (const auto& constraint: { LineConstraint(Line::ROW, { }), LineConstraint(Line::ROW, { 0 }) })
     {
         CHECK(constraint.line_trivial_nb_alternatives(0, binomial) == 1);
@@ -62,7 +60,7 @@ TEST_CASE("empty_line", "[line_constraint]")
 
 TEST_CASE("full_line", "[line_constraint]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     for (unsigned int line_sz = 0; line_sz < 10; line_sz++)
     {
         LineConstraint constraint(Line::ROW, { line_sz });
@@ -73,7 +71,7 @@ TEST_CASE("full_line", "[line_constraint]")
 
 TEST_CASE("trivial_reduction", "[line_constraint]")
 {
-    BinomialCoefficients::Cache binomial;
+    binomial::Cache binomial;
     LineConstraint constraint(Line::ROW, { 6, 1 });
 
     CHECK_THROWS(constraint.line_trivial_nb_alternatives(7, binomial));
diff --git a/src/tests/picross/src/test_solver.cpp b/src/tests/picross/src/test_solver.cpp
index 74ed0bf..dc830f0 100644
--- a/src/tests/picross/src/test_solver.cpp
+++ b/src/tests/picross/src/test_solver.cpp
@@ -4,8 +4,7 @@
 #include <utils/text_io.h>
 
 
-namespace picross
-{
+namespace picross {
 
 TEST_CASE("Constraints can use zero to declare an empty row or column", "[solver]")
 {
diff --git a/src/tests/picross/src/test_utils.cpp b/src/tests/picross/src/test_utils.cpp
index 94542df..429fbe9 100644
--- a/src/tests/picross/src/test_utils.cpp
+++ b/src/tests/picross/src/test_utils.cpp
@@ -2,8 +2,7 @@
 #include <picross/picross.h>
 #include <utils/text_io.h>
 
-namespace picross
-{
+namespace picross {
 
 TEST_CASE("build_output_grid_from", "[text_io]")
 {
diff --git a/src/utils/include/utils/bitmap_io.h b/src/utils/include/utils/bitmap_io.h
index 760b110..bfd2c24 100644
--- a/src/utils/include/utils/bitmap_io.h
+++ b/src/utils/include/utils/bitmap_io.h
@@ -5,7 +5,6 @@
 #include <string>
 #include <memory>
 
-
 picross::OutputGrid import_bitmap_pbm(const std::string& filepath, const picross::io::ErrorHandler& error_handler) noexcept;
 
 void export_bitmap_pbm(const std::string& filepath, const picross::OutputGrid& grid, const picross::io::ErrorHandler& error_handler) noexcept;
diff --git a/src/utils/include/utils/console_observer.h b/src/utils/include/utils/console_observer.h
index e8e3e62..1013b09 100644
--- a/src/utils/include/utils/console_observer.h
+++ b/src/utils/include/utils/console_observer.h
@@ -8,7 +8,6 @@
 
 #include <optional>
 
-
 class ConsoleObserver final : public GridObserver
 {
 public:
diff --git a/src/utils/include/utils/console_progress_observer.h b/src/utils/include/utils/console_progress_observer.h
index 41bae6a..c628b87 100644
--- a/src/utils/include/utils/console_progress_observer.h
+++ b/src/utils/include/utils/console_progress_observer.h
@@ -7,7 +7,6 @@
 
 #include <optional>
 
-
 class ConsoleProgressObserver final
 {
 public:
diff --git a/src/utils/include/utils/grid_observer.h b/src/utils/include/utils/grid_observer.h
index adfd66f..468641a 100644
--- a/src/utils/include/utils/grid_observer.h
+++ b/src/utils/include/utils/grid_observer.h
@@ -5,7 +5,6 @@
 #include <cstddef>
 #include <vector>
 
-
 class ObserverGrid : public picross::OutputGrid
 {
     friend class GridObserver;
diff --git a/src/utils/include/utils/input_grid_utils.h b/src/utils/include/utils/input_grid_utils.h
index f3eca30..f227c42 100644
--- a/src/utils/include/utils/input_grid_utils.h
+++ b/src/utils/include/utils/input_grid_utils.h
@@ -4,10 +4,10 @@
 
 #include <ostream>
 
+namespace picross {
 
-namespace picross
-{
 void stream_input_grid_constraint(std::ostream& out, const InputGrid& input_grid, const LineId& line_id);
 void stream_input_grid_line_id_and_constraint(std::ostream& out, const InputGrid& input_grid, const LineId& line_id);
 void stream_input_grid_constraints(std::ostream& out, const InputGrid& input_grid);
-}
+
+} // namespace picross
diff --git a/src/utils/include/utils/picross_file_io.h b/src/utils/include/utils/picross_file_io.h
index f420cc1..2d5f35d 100644
--- a/src/utils/include/utils/picross_file_io.h
+++ b/src/utils/include/utils/picross_file_io.h
@@ -6,10 +6,8 @@
 #include <ostream>
 #include <string_view>
 
-namespace picross
-{
-namespace io
-{
+namespace picross {
+namespace io {
 
 enum class PicrossFileFormat
 {
@@ -28,5 +26,5 @@ std::vector<IOGrid> parse_picross_file(std::string_view filepath, PicrossFileFor
 
 void save_picross_file(std::string_view filepath, PicrossFileFormat format, const IOGrid& io_grid, const ErrorHandler& error_handler) noexcept;
 
-}
-}
+} // namespace io
+} // namespace picross
diff --git a/src/utils/include/utils/test_helpers.h b/src/utils/include/utils/test_helpers.h
index aef3a3b..4c55304 100644
--- a/src/utils/include/utils/test_helpers.h
+++ b/src/utils/include/utils/test_helpers.h
@@ -5,8 +5,7 @@
 #include <cstddef>
 #include <unordered_set>
 
-namespace picross
-{
+namespace picross {
 
 // Hasher for OutputGrid
 struct OutputGridHasher
@@ -16,4 +15,4 @@ struct OutputGridHasher
 
 using OutputGridSet = std::unordered_set<OutputGrid, OutputGridHasher>;
 
-} // namespace picross
\ No newline at end of file
+} // namespace picross
diff --git a/src/utils/include/utils/text_io.h b/src/utils/include/utils/text_io.h
index 5b28da2..bb89c37 100644
--- a/src/utils/include/utils/text_io.h
+++ b/src/utils/include/utils/text_io.h
@@ -6,8 +6,7 @@
 #include <string_view>
 #include <vector>
 
-namespace picross
-{
+namespace picross {
 
 // Utility functions to build an OutputGrid from a vector of tiles, or a string, arranged in row-major order:
 
@@ -25,8 +24,7 @@ OutputGrid build_output_grid_from(std::size_t width, std::size_t height, const s
 // Unless the grid width and height are given as arguments, they are deduced from the presence of EOL characters
 OutputGrid build_output_grid_from(std::size_t width, std::size_t height, std::string_view tiles, std::string_view name = "Test");
 OutputGrid build_output_grid_from(std::string_view tiles, std::string_view name = "Test");
-namespace io
-{
+namespace io {
 OutputGrid parse_output_grid_from_file(std::string_view filepath, const io::ErrorHandler& error_handler) noexcept;
 }
 
@@ -38,4 +36,4 @@ OutputGrid parse_output_grid_from_file(std::string_view filepath, const io::Erro
 Line build_line_from(std::string_view tiles, Line::Type type = Line::ROW, unsigned int index = 0);
 Line build_line_from(char tile, std::size_t count, Line::Type type = Line::ROW, unsigned int index = 0);
 
-} // namespace picross
\ No newline at end of file
+} // namespace picross
diff --git a/src/utils/src/bitmap_io.cpp b/src/utils/src/bitmap_io.cpp
index 80bf303..869a2f2 100644
--- a/src/utils/src/bitmap_io.cpp
+++ b/src/utils/src/bitmap_io.cpp
@@ -7,7 +7,6 @@
 #include <exception>
 #include <filesystem>
 
-
 picross::OutputGrid import_bitmap_pbm(const std::string& filepath, const picross::io::ErrorHandler& error_handler) noexcept
 {
     try
diff --git a/src/utils/src/console_observer.cpp b/src/utils/src/console_observer.cpp
index eebe965..38730e0 100644
--- a/src/utils/src/console_observer.cpp
+++ b/src/utils/src/console_observer.cpp
@@ -5,7 +5,6 @@
 #include <exception>
 #include <memory>
 
-
 ConsoleObserver::ConsoleObserver(size_t width, size_t height, std::ostream& ostream)
     : GridObserver(width, height)
     , m_ostream(ostream)
diff --git a/src/utils/src/console_progress_observer.cpp b/src/utils/src/console_progress_observer.cpp
index e3371f3..f147949 100644
--- a/src/utils/src/console_progress_observer.cpp
+++ b/src/utils/src/console_progress_observer.cpp
@@ -4,7 +4,6 @@
 #include <cstdint>
 #include <exception>
 
-
 ConsoleProgressObserver::ConsoleProgressObserver(std::ostream& ostream)
     : m_ostream(ostream)
     , m_previous_progress(0.f)
diff --git a/src/utils/src/grid_observer.cpp b/src/utils/src/grid_observer.cpp
index 9abb1dc..1a5eff9 100644
--- a/src/utils/src/grid_observer.cpp
+++ b/src/utils/src/grid_observer.cpp
@@ -4,7 +4,6 @@
 #include <exception>
 #include <iostream>
 
-
 ObserverGrid::ObserverGrid(size_t width, size_t height, unsigned int depth, const std::string& name)
     : OutputGrid(width, height, picross::Tile::UNKNOWN, name)
     , m_depth(depth)
diff --git a/src/utils/src/input_grid_utils.cpp b/src/utils/src/input_grid_utils.cpp
index a0df311..16b5eea 100644
--- a/src/utils/src/input_grid_utils.cpp
+++ b/src/utils/src/input_grid_utils.cpp
@@ -3,9 +3,8 @@
 #include <algorithm>
 #include <cassert>
 
+namespace picross {
 
-namespace picross
-{
     void stream_input_grid_constraint(std::ostream& out, const InputGrid& input_grid, const LineId& line_id)
     {
         const auto& constraint = get_constraint(input_grid, line_id);
diff --git a/src/utils/src/picross_file_io.cpp b/src/utils/src/picross_file_io.cpp
index 72cb706..f90427e 100644
--- a/src/utils/src/picross_file_io.cpp
+++ b/src/utils/src/picross_file_io.cpp
@@ -10,11 +10,8 @@
 #include <fstream>
 #include <sstream>
 
-
-namespace picross
-{
-namespace io
-{
+namespace picross {
+namespace io {
 
 std::ostream& operator<<(std::ostream& out, PicrossFileFormat format)
 {
@@ -108,8 +105,7 @@ std::vector<IOGrid> parse_picross_file(std::string_view filepath, PicrossFileFor
     return {};
 }
 
-namespace
-{
+namespace {
     std::string goal_non_set_error_msg(std::string_view filepath, PicrossFileFormat format)
     {
         std::stringstream msg;
diff --git a/src/utils/src/text_io.cpp b/src/utils/src/text_io.cpp
index a2ae0fe..9875050 100644
--- a/src/utils/src/text_io.cpp
+++ b/src/utils/src/text_io.cpp
@@ -7,9 +7,7 @@
 #include <fstream>
 #include <sstream>
 
-
-namespace picross
-{
+namespace picross {
 
 OutputGrid build_output_grid_from(std::size_t width, std::size_t height, const std::vector<int>& tiles, std::string_view name)
 {