diff --git a/include/kami/grid1d.h b/include/kami/grid1d.h
index 9d1e4a6..c9f20e8 100644
--- a/include/kami/grid1d.h
+++ b/include/kami/grid1d.h
@@ -51,7 +51,7 @@ namespace kami {
         /**
          * @brief Constructor for one-dimensional coordinates
          */
-        explicit GridCoord1D(int x_coord);;
+        explicit GridCoord1D(int x_coord);
 
         /**
          * @brief Return the `x` coordinate
diff --git a/include/kami/grid2d.h b/include/kami/grid2d.h
index ad1ef22..2c3a083 100644
--- a/include/kami/grid2d.h
+++ b/include/kami/grid2d.h
@@ -133,10 +133,31 @@ namespace kami {
         inline friend GridCoord2D operator*(const double lhs, const GridCoord2D &rhs);
 
     protected:
+        /**
+         * @brief Find the distance between two points using the Chebyshev metric
+         *
+         * @param p the point to measure the distance to
+         *
+         * @returns the distance as a `double`
+         */
         inline double distance_chebyshev(std::shared_ptr<GridCoord2D> &p) const;
 
+        /**
+         * @brief Find the distance between two points using the Euclidean metric
+         *
+         * @param p the point to measure the distance to
+         *
+         * @returns the distance as a `double`
+         */
         inline double distance_euclidean(std::shared_ptr<GridCoord2D> &p) const;
 
+        /**
+         * @brief Find the distance between two points using the Manhattan metric
+         *
+         * @param p the point to measure the distance to
+         *
+         * @returns the distance as a `double`
+         */
         inline double distance_manhattan(std::shared_ptr<GridCoord2D> &p) const;
 
     private:
diff --git a/src/libkami/domain.cc b/src/libkami/domain.cc
index f64f18b..e7b5c5f 100644
--- a/src/libkami/domain.cc
+++ b/src/libkami/domain.cc
@@ -23,11 +23,11 @@
  * SOFTWARE.
  */
 
-#include <kami/domain.h>
-
 #include <iostream>
 #include <string>
 
+#include <kami/domain.h>
+
 namespace kami {
 
     std::ostream &operator<<(std::ostream &lhs, const Coord &rhs) {
diff --git a/src/libkami/grid1d.cc b/src/libkami/grid1d.cc
index 08be7c0..6d01f12 100644
--- a/src/libkami/grid1d.cc
+++ b/src/libkami/grid1d.cc
@@ -23,10 +23,6 @@
  * SOFTWARE.
  */
 
-#include <kami/agent.h>
-#include <kami/domain.h>
-#include <kami/grid1d.h>
-
 #include <map>
 #include <memory>
 #include <optional>
@@ -35,6 +31,10 @@
 #include <unordered_set>
 #include <utility>
 
+#include <kami/agent.h>
+#include <kami/domain.h>
+#include <kami/grid1d.h>
+
 namespace kami {
 
     GridCoord1D::GridCoord1D(int x_coord) : _x_coord(x_coord) {}
diff --git a/src/libkami/grid2d.cc b/src/libkami/grid2d.cc
index 98a12d9..cd295bb 100644
--- a/src/libkami/grid2d.cc
+++ b/src/libkami/grid2d.cc
@@ -23,10 +23,6 @@
  * SOFTWARE.
  */
 
-#include <kami/agent.h>
-#include <kami/domain.h>
-#include <kami/grid2d.h>
-
 #include <map>
 #include <memory>
 #include <optional>
@@ -34,6 +30,10 @@
 #include <utility>
 #include <vector>
 
+#include <kami/agent.h>
+#include <kami/domain.h>
+#include <kami/grid2d.h>
+
 namespace kami {
 
     int GridCoord2D::get_x_location() const {