diff --git a/include/query_engine/code_generator.hpp b/include/query_engine/code_generator.hpp
index 964c824bb..09d7908cb 100644
--- a/include/query_engine/code_generator.hpp
+++ b/include/query_engine/code_generator.hpp
@@ -3,11 +3,11 @@
 #include "config/config.hpp"
 #include "cypher/ast/ast.hpp"
 #include "cypher/compiler.hpp"
+#include "logging/default.hpp"
 #include "query_engine/exceptions/errors.hpp"
 #include "template_engine/engine.hpp"
 #include "traverser/cpp_traverser.hpp"
 #include "utils/string/file.hpp"
-#include "logging/default.hpp"
 #include "utils/type_discovery.hpp"
 
 using std::string;
@@ -56,6 +56,7 @@ public:
                             {"stripped_hash", std::to_string(stripped_hash)},
                             {"query", query},
                             // {"stream", type_name<Stream>().to_string()},
+                            // BARRIER !!!!
                             {"stream", "RecordStream<io::Socket>"},
                             {"code", cpp_traverser.code}});
 
diff --git a/include/query_engine/i_code_cpu.hpp b/include/query_engine/i_code_cpu.hpp
index fd7d7d02f..ae44de8b9 100644
--- a/include/query_engine/i_code_cpu.hpp
+++ b/include/query_engine/i_code_cpu.hpp
@@ -13,8 +13,7 @@ template <typename Stream>
 class ICodeCPU
 {
 public:
-    virtual bool run(barrier::Db &db, code_args_t &args,
-                     Stream &stream) = 0;
+    virtual bool run(barrier::Db &db, code_args_t &args, Stream &stream) = 0;
     virtual ~ICodeCPU() {}
 };
 
diff --git a/include/storage/edge_accessor.hpp b/include/storage/edge_accessor.hpp
index ddf638494..9fc06765a 100644
--- a/include/storage/edge_accessor.hpp
+++ b/include/storage/edge_accessor.hpp
@@ -3,6 +3,7 @@
 #include "storage/edge.hpp"
 #include "storage/edge_record.hpp"
 #include "storage/record_accessor.hpp"
+#include "storage/vertex_accessor.hpp"
 #include "utils/assert.hpp"
 #include "utils/reference_wrapper.hpp"
 
@@ -23,7 +24,7 @@ public:
 
     const EdgeType &edge_type() const;
 
-    auto from() const;
+    VertexAccessor from() const;
 
-    auto to() const;
+    VertexAccessor to() const;
 };
diff --git a/include/storage/edge_x_vertex.hpp b/include/storage/edge_x_vertex.hpp
index 9a92ea1fc..382fe4a0c 100644
--- a/include/storage/edge_x_vertex.hpp
+++ b/include/storage/edge_x_vertex.hpp
@@ -5,16 +5,6 @@
 #include "storage/edge_accessor.hpp"
 #include "storage/vertex_accessor.hpp"
 
-auto EdgeAccessor::from() const
-{
-    return VertexAccessor(this->vlist->from(), this->db);
-}
-
-auto EdgeAccessor::to() const
-{
-    return VertexAccessor(this->vlist->to(), this->db);
-}
-
 auto VertexAccessor::out() const
 {
     DbTransaction &t = this->db;
diff --git a/src/communication/bolt/v1/serialization/bolt_serializer.cpp b/src/communication/bolt/v1/serialization/bolt_serializer.cpp
index b45445897..72331143a 100644
--- a/src/communication/bolt/v1/serialization/bolt_serializer.cpp
+++ b/src/communication/bolt/v1/serialization/bolt_serializer.cpp
@@ -4,7 +4,6 @@
 #include "communication/bolt/v1/transport/chunked_encoder.hpp"
 #include "communication/bolt/v1/transport/socket_stream.hpp"
 #include "io/network/socket.hpp"
-#include "storage/edge_x_vertex.hpp"
 
 template <class Stream>
 void bolt::BoltSerializer<Stream>::write(const EdgeAccessor &edge)
diff --git a/src/storage/edge_accessor.cpp b/src/storage/edge_accessor.cpp
index 5bbd2f823..9ac3a75df 100644
--- a/src/storage/edge_accessor.cpp
+++ b/src/storage/edge_accessor.cpp
@@ -10,3 +10,13 @@ const EdgeType &EdgeAccessor::edge_type() const
     runtime_assert(this->record->data.edge_type != nullptr, "EdgeType is null");
     return *this->record->data.edge_type;
 }
+
+VertexAccessor EdgeAccessor::from() const
+{
+    return VertexAccessor(this->vlist->from(), this->db);
+}
+
+VertexAccessor EdgeAccessor::to() const
+{
+    return VertexAccessor(this->vlist->to(), this->db);
+}