diff --git a/src/client/WFKafkaClient.cc b/src/client/WFKafkaClient.cc
index 36a258f7..1fe60cb4 100644
--- a/src/client/WFKafkaClient.cc
+++ b/src/client/WFKafkaClient.cc
@@ -1606,3 +1606,4 @@ KafkaBrokerList *WFKafkaClient::get_broker_list()
 {
 	return this->member->broker_list;
 }
+
diff --git a/src/client/WFKafkaClient.h b/src/client/WFKafkaClient.h
index 66705235..b56efa22 100644
--- a/src/client/WFKafkaClient.h
+++ b/src/client/WFKafkaClient.h
@@ -153,3 +153,4 @@ private:
 };
 
 #endif
+
diff --git a/src/factory/KafkaTaskImpl.cc b/src/factory/KafkaTaskImpl.cc
index f1713dd1..dd3f125f 100644
--- a/src/factory/KafkaTaskImpl.cc
+++ b/src/factory/KafkaTaskImpl.cc
@@ -633,3 +633,4 @@ __WFKafkaTask *__WFKafkaTaskFactory::create_kafka_task(const char *host,
 	task->set_keep_alive(KAFKA_KEEPALIVE_DEFAULT);
 	return task;
 }
+
diff --git a/src/factory/KafkaTaskImpl.inl b/src/factory/KafkaTaskImpl.inl
index e2a109d5..acf40d5b 100644
--- a/src/factory/KafkaTaskImpl.inl
+++ b/src/factory/KafkaTaskImpl.inl
@@ -52,3 +52,4 @@ public:
 											const std::string& info,
 											__kafka_callback_t callback);
 };
+
diff --git a/src/nameservice/UpstreamPolicies.cc b/src/nameservice/UpstreamPolicies.cc
index 861d0a49..f6d79636 100644
--- a/src/nameservice/UpstreamPolicies.cc
+++ b/src/nameservice/UpstreamPolicies.cc
@@ -700,3 +700,4 @@ const EndpointAddress *UPSManualPolicy::another_strategy(const ParsedURI& uri,
 																   uri.fragment ? uri.fragment : "");
 	return this->consistent_hash_with_group(hash_value);
 }
+
diff --git a/src/protocol/KafkaMessage.cc b/src/protocol/KafkaMessage.cc
index cd4bf801..7a09dca7 100644
--- a/src/protocol/KafkaMessage.cc
+++ b/src/protocol/KafkaMessage.cc
@@ -3834,3 +3834,4 @@ int KafkaResponse::append(const void *buf, size_t *size)
 }
 
 }
+
diff --git a/src/protocol/KafkaMessage.h b/src/protocol/KafkaMessage.h
index 07830208..2978fa25 100644
--- a/src/protocol/KafkaMessage.h
+++ b/src/protocol/KafkaMessage.h
@@ -264,3 +264,4 @@ private:
 }
 
 #endif
+
diff --git a/src/protocol/KafkaResult.cc b/src/protocol/KafkaResult.cc
index 4dc5983b..e5d82ffd 100644
--- a/src/protocol/KafkaResult.cc
+++ b/src/protocol/KafkaResult.cc
@@ -118,3 +118,4 @@ void KafkaResult::fetch_records(std::vector<std::vector<KafkaRecord *>>& records
 }
 
 }
+
diff --git a/src/protocol/KafkaResult.h b/src/protocol/KafkaResult.h
index 2e1c20b3..4eac8396 100644
--- a/src/protocol/KafkaResult.h
+++ b/src/protocol/KafkaResult.h
@@ -62,3 +62,4 @@ private:
 }
 
 #endif
+
diff --git a/src/protocol/RedisMessage.cc b/src/protocol/RedisMessage.cc
index 9c437270..de0bd88f 100644
--- a/src/protocol/RedisMessage.cc
+++ b/src/protocol/RedisMessage.cc
@@ -426,6 +426,11 @@ std::string RedisValue::debug_string() const
 	return ret;
 }
 
+RedisValue::~RedisValue()
+{
+	free_data();
+}
+
 RedisMessage::RedisMessage():
 	parser_(new redis_parser_t),
 	stream_(new EncodeStream),
@@ -445,11 +450,6 @@ RedisMessage::~RedisMessage()
 	}
 }
 
-RedisValue::~RedisValue()
-{
-	free_data();
-}
-
 RedisMessage::RedisMessage(RedisMessage&& move) :
 	ProtocolMessage(std::move(move))
 {
@@ -696,3 +696,4 @@ bool RedisResponse::set_result(const RedisValue& value)
 }
 
 }
+
diff --git a/src/protocol/RedisMessage.h b/src/protocol/RedisMessage.h
index d5540030..1426ed12 100644
--- a/src/protocol/RedisMessage.h
+++ b/src/protocol/RedisMessage.h
@@ -321,3 +321,4 @@ inline void RedisResponse::get_result(RedisValue& value) const
 }
 
 #endif
+
diff --git a/src/protocol/kafka_parser.c b/src/protocol/kafka_parser.c
index 614d2130..01368e5c 100644
--- a/src/protocol/kafka_parser.c
+++ b/src/protocol/kafka_parser.c
@@ -1234,3 +1234,4 @@ int kafka_sasl_set_password(const char *password, kafka_config_t *conf)
 	conf->password = t;
 	return 0;
 }
+
diff --git a/src/protocol/kafka_parser.h b/src/protocol/kafka_parser.h
index 12000c93..1390d407 100644
--- a/src/protocol/kafka_parser.h
+++ b/src/protocol/kafka_parser.h
@@ -487,3 +487,4 @@ int kafka_sasl_set_password(const char *passwd, kafka_config_t *conf);
 #endif
 
 #endif
+
diff --git a/tutorial/CMakeLists.txt b/tutorial/CMakeLists.txt
index 6ee4fbf5..75f994bf 100644
--- a/tutorial/CMakeLists.txt
+++ b/tutorial/CMakeLists.txt
@@ -28,9 +28,9 @@ set(TUTORIAL_LIST
 	tutorial-04-http_echo_server
 	tutorial-05-http_proxy
 	tutorial-06-parallel_wget
-	tutorial-09-http_file_server
 	tutorial-07-sort_task
 	tutorial-08-matrix_multiply
+	tutorial-09-http_file_server
 	tutorial-11-graph_task
 )
 
diff --git a/tutorial/GNUmakefile b/tutorial/GNUmakefile
index c04b88cd..78af2403 100644
--- a/tutorial/GNUmakefile
+++ b/tutorial/GNUmakefile
@@ -9,7 +9,6 @@ CMAKE3 := $(shell if which cmake3>/dev/null ; then echo cmake3; else echo cmake;
 KAFKA 		?= n
 MYSQL 		?= y
 REDIS 		?= y
-UPSTREAM 	?= y
 
 .PHONY: $(ALL_TARGETS)
 
@@ -17,9 +16,9 @@ all:
 	mkdir -p $(BUILD_DIR)
 
 ifeq ($(DEBUG),y)
-	cd $(BUILD_DIR) && $(CMAKE3) -D CMAKE_BUILD_TYPE=Debug -D KAFKA=$(KAFKA) -D MYSQL=$(MYSQL) -D REDIS=$(REDIS) -D UPSTREAM=$(UPSTREAM) $(ROOT_DIR)
+	cd $(BUILD_DIR) && $(CMAKE3) -D CMAKE_BUILD_TYPE=Debug -D KAFKA=$(KAFKA) -D MYSQL=$(MYSQL) -D REDIS=$(REDIS) $(ROOT_DIR)
 else
-	cd $(BUILD_DIR) && $(CMAKE3) -D KAFKA=$(KAFKA) -D MYSQL=$(MYSQL) -D REDIS=$(REDIS) -D UPSTREAM=$(UPSTREAM) $(ROOT_DIR)
+	cd $(BUILD_DIR) && $(CMAKE3) -D KAFKA=$(KAFKA) -D MYSQL=$(MYSQL) -D REDIS=$(REDIS) $(ROOT_DIR)
 endif
 	make -C $(BUILD_DIR) -f Makefile