diff --git a/source/kelgin/async.h b/source/kelgin/async.h
index af69cfc..2e2cf47 100644
--- a/source/kelgin/async.h
+++ b/source/kelgin/async.h
@@ -183,7 +183,7 @@ public:
 	 * Useful for resource lifetime control.
 	 */
 	template <typename... Args>
-	[[nodiscard]] Conveyor<T> attach(Args &&...args);
+	[[nodiscard]] Conveyor<T> attach(Args &&... args);
 
 	/** @todo implement
 	 * This method limits the total amount of passed elements
@@ -601,7 +601,7 @@ private:
 	std::tuple<Args...> attached_data;
 
 public:
-	AttachConveyorNode(Own<ConveyorNode> &&dep, Args &&...args)
+	AttachConveyorNode(Own<ConveyorNode> &&dep, Args &&... args)
 		: AttachConveyorNodeBase(std::move(dep)), attached_data{
 													  std::move(args...)} {}
 };
diff --git a/source/kelgin/async.tmpl.h b/source/kelgin/async.tmpl.h
index 67312e5..292a38d 100644
--- a/source/kelgin/async.tmpl.h
+++ b/source/kelgin/async.tmpl.h
@@ -73,7 +73,7 @@ template <typename T> Conveyor<T> Conveyor<T>::buffer(size_t size) {
 
 template <typename T>
 template <typename... Args>
-Conveyor<T> Conveyor<T>::attach(Args &&...args) {
+Conveyor<T> Conveyor<T>::attach(Args &&... args) {
 	Own<AttachConveyorNode<Args...>> attach_node =
 		heap<AttachConveyorNode<Args...>>(std::move(node), std::move(args...));
 	return Conveyor<T>{std::move(attach_node), storage};
diff --git a/source/kelgin/common.h b/source/kelgin/common.h
index 3939076..58d4d2b 100644
--- a/source/kelgin/common.h
+++ b/source/kelgin/common.h
@@ -39,11 +39,11 @@ template <typename T> using Our = std::shared_ptr<T>;
 
 template <typename T> using Lent = std::weak_ptr<T>;
 
-template <typename T, class... Args> Own<T> heap(Args &&...args) {
+template <typename T, class... Args> Own<T> heap(Args &&... args) {
 	return Own<T>(new T(std::forward<Args>(args)...));
 }
 
-template <typename T, class... Args> Our<T> share(Args &&...args) {
+template <typename T, class... Args> Our<T> share(Args &&... args) {
 	return std::make_shared<T>(std::forward<Args>(args)...);
 }
 
diff --git a/source/kelgin/json.h b/source/kelgin/json.h
index 189a491..edb5b6f 100644
--- a/source/kelgin/json.h
+++ b/source/kelgin/json.h
@@ -835,9 +835,7 @@ Error JsonCodec::decodeValue(Own<DynamicMessage> &message, Buffer &buffer,
 		decodeNull(buffer);
 		message = std::move(msg_null);
 	} break;
-	default: {
-		return criticalError("Cannot identify next JSON value");
-	}
+	default: { return criticalError("Cannot identify next JSON value"); }
 	}
 
 	skipWhitespace(buffer);
diff --git a/source/kelgin/message.h b/source/kelgin/message.h
index 2c50b68..6d39046 100644
--- a/source/kelgin/message.h
+++ b/source/kelgin/message.h
@@ -122,13 +122,9 @@ public:
 		}
 	};
 
-	Builder build(){
-		return Builder{*this};
-	}
+	Builder build() { return Builder{*this}; }
 
-	Reader read(){
-		return Reader{*this};
-	}
+	Reader read() { return Reader{*this}; }
 };
 
 /*
@@ -375,19 +371,20 @@ public:
 	}
 };
 
-template<class Schema, class Container = MessageContainer<Schema>>
+template <class Schema, class Container = MessageContainer<Schema>>
 class HeapMessageRoot {
 private:
 	Own<Message<Schema, Container>> root;
-public:
-	HeapMessageRoot(Own<Message<Schema,Container>> r):root{std::move(r)}{}
 
-	typename Message<Schema, Container>::Builder build(){
+public:
+	HeapMessageRoot(Own<Message<Schema, Container>> r) : root{std::move(r)} {}
+
+	typename Message<Schema, Container>::Builder build() {
 		assert(root);
 		return root->build();
 	}
 
-	typename Message<Schema, Container>::Reader read(){
+	typename Message<Schema, Container>::Reader read() {
 		assert(root);
 		return root->read();
 	}
@@ -396,10 +393,9 @@ public:
 /*
  * Minor helper for creating a message root
  */
-template<class Schema, class Container = MessageContainer<Schema>> 
+template <class Schema, class Container = MessageContainer<Schema>>
 inline HeapMessageRoot heapMessageRoot() {
 	Own<Message<Schema, Container>> root = heap<Message<Schema, Container>>();
 	return HeapMessageRoot<Schema, Container>{std::move(root)};
-
 }
 } // namespace gin