diff --git a/modules/prediction/evaluator/evaluator_factory.cc b/modules/prediction/evaluator/evaluator_factory.cc
index 6fa0988fbcb62c3113d579ff9de0ac11b378918f..d1db0d38e81510be12a1e1384bc1f5ca20d82ed1 100644
--- a/modules/prediction/evaluator/evaluator_factory.cc
+++ b/modules/prediction/evaluator/evaluator_factory.cc
@@ -16,8 +16,8 @@
 
 #include "modules/prediction/evaluator/evaluator_factory.h"
 
-#include "modules/prediction/evaluator/vehicle/mlp_evaluator.h"
 #include "modules/common/log.h"
+#include "modules/prediction/evaluator/vehicle/mlp_evaluator.h"
 
 namespace apollo {
 namespace prediction {
diff --git a/modules/prediction/evaluator/evaluator_factory.h b/modules/prediction/evaluator/evaluator_factory.h
index 3de3a3e1e13f624459548112bf063b3e3a513fd5..ff39a785ce4dfb3547948f298b4ada5e51c25a37 100644
--- a/modules/prediction/evaluator/evaluator_factory.h
+++ b/modules/prediction/evaluator/evaluator_factory.h
@@ -24,10 +24,10 @@
 
 #include <memory>
 
+#include "modules/common/macro.h"
+#include "modules/common/util/factory.h"
 #include "modules/prediction/evaluator/evaluator.h"
 #include "modules/prediction/proto/prediction_conf.pb.h"
-#include "modules/common/util/factory.h"
-#include "modules/common/macro.h"
 
 /**
  * @namespace apollo::prediction
diff --git a/modules/prediction/evaluator/evaluator_manager.cc b/modules/prediction/evaluator/evaluator_manager.cc
index 9efab2a51231d8de6e41c0aec8391db446e502aa..c748b0800cde03ad0ddf2bea2ca339bea7ca06a2 100644
--- a/modules/prediction/evaluator/evaluator_manager.cc
+++ b/modules/prediction/evaluator/evaluator_manager.cc
@@ -16,10 +16,10 @@
 
 #include "modules/prediction/evaluator/evaluator_manager.h"
 
+#include "modules/common/log.h"
 #include "modules/prediction/evaluator/vehicle/mlp_evaluator.h"
 #include "modules/prediction/container/container_manager.h"
 #include "modules/prediction/container/obstacles/obstacles_container.h"
-#include "modules/common/log.h"
 
 namespace apollo {
 namespace prediction {
@@ -64,11 +64,8 @@ void EvaluatorManager::Init(const PredictionConf& config) {
 
 Evaluator* EvaluatorManager::GetEvaluator(
     const ObstacleConf::EvaluatorType& type) {
-  if (evaluators_.find(type) != evaluators_.end()) {
-    return evaluators_[type].get();
-  } else {
-    return nullptr;
-  }
+  auto it = evaluators_.find(type);
+  return it != evaluators_.end() ? it->second.get() : nullptr;
 }
 
 void EvaluatorManager::Run(
diff --git a/modules/prediction/evaluator/evaluator_manager.h b/modules/prediction/evaluator/evaluator_manager.h
index 4c6700a0a7d4be8bd0eb580f40941441cf133a64..879e06302eddc322b824e3348aab1a0f1f93dae2 100644
--- a/modules/prediction/evaluator/evaluator_manager.h
+++ b/modules/prediction/evaluator/evaluator_manager.h
@@ -84,8 +84,7 @@ class EvaluatorManager {
   void RegisterEvaluators();
 
  private:
-  std::map<ObstacleConf::EvaluatorType,
-      std::unique_ptr<Evaluator>> evaluators_;
+  std::map<ObstacleConf::EvaluatorType, std::unique_ptr<Evaluator>> evaluators_;
 
   ObstacleConf::EvaluatorType vehicle_on_lane_evaluator_ =
       ObstacleConf::MLP_EVALUATOR;
diff --git a/modules/prediction/evaluator/evaluator_manager_test.cc b/modules/prediction/evaluator/evaluator_manager_test.cc
index 8dc7bbb82d023eea3dabea7511e57860a550bae8..a05beb13ba868c9a17d1ec0f09d8c1a35e6bc150 100644
--- a/modules/prediction/evaluator/evaluator_manager_test.cc
+++ b/modules/prediction/evaluator/evaluator_manager_test.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  *****************************************************************************/
 
-#include <string>
+#include "modules/prediction/evaluator/evaluator_manager.h"
 
+#include <string>
 #include "gtest/gtest.h"
 
-#include "modules/prediction/evaluator/evaluator_manager.h"
-#include "modules/prediction/proto/prediction_conf.pb.h"
 #include "modules/common/util/file.h"
+#include "modules/prediction/proto/prediction_conf.pb.h"
 
 namespace apollo {
 namespace prediction {
@@ -38,10 +38,8 @@ class EvaluatorManagerTest : public ::testing::Test {
 
 TEST_F(EvaluatorManagerTest, GetEvaluators) {
   std::string conf_file = "modules/prediction/testdata/prediction_conf.pb.txt";
-  bool ret_load_conf = ::apollo::common::util::GetProtoFromFile(conf_file,
-                                                                &conf_);
-  EXPECT_TRUE(ret_load_conf);
-  EXPECT_TRUE(conf_.IsInitialized());
+  CHECK(apollo::common::util::GetProtoFromFile(conf_file, &conf_))
+      << "Failed to load " << conf_file;
 
   manager_->Init(conf_);
 
diff --git a/modules/prediction/evaluator/vehicle/mlp_evaluator.cc b/modules/prediction/evaluator/vehicle/mlp_evaluator.cc
index 0116075042ee70cdb0bbf9a456ef8adbfb7d855e..9f0e131fcc799eb25fdca8857f4d72dabff8c362 100644
--- a/modules/prediction/evaluator/vehicle/mlp_evaluator.cc
+++ b/modules/prediction/evaluator/vehicle/mlp_evaluator.cc
@@ -14,15 +14,16 @@
  * limitations under the License.
  *****************************************************************************/
 
+#include "modules/prediction/evaluator/vehicle/mlp_evaluator.h"
+
 #include <cmath>
 #include <numeric>
 
-#include "modules/prediction/evaluator/vehicle/mlp_evaluator.h"
-#include "modules/prediction/common/prediction_gflags.h"
 #include "modules/common/math/math_utils.h"
-#include "modules/prediction/common/prediction_util.h"
-#include "modules/map/proto/map_lane.pb.h"
 #include "modules/common/util/file.h"
+#include "modules/map/proto/map_lane.pb.h"
+#include "modules/prediction/common/prediction_gflags.h"
+#include "modules/prediction/common/prediction_util.h"
 
 namespace apollo {
 namespace prediction {
@@ -80,11 +81,12 @@ void MLPEvaluator::ExtractFeatureValues(Obstacle* obstacle_ptr,
   feature_values_.clear();
   int id = obstacle_ptr->id();
   std::vector<double> obstacle_feature_values;
-  if (obstacle_feature_values_map_.find(id) ==
-      obstacle_feature_values_map_.end()) {
+
+  auto it = obstacle_feature_values_map_.find(id);
+  if (it == obstacle_feature_values_map_.end()) {
     SetObstacleFeatureValues(obstacle_ptr, &obstacle_feature_values);
   } else {
-    obstacle_feature_values = obstacle_feature_values_map_[id];
+    obstacle_feature_values = it->second;
   }
 
   if (obstacle_feature_values.size() != OBSTACLE_FEATURE_SIZE) {
diff --git a/modules/prediction/evaluator/vehicle/mlp_evaluator.h b/modules/prediction/evaluator/vehicle/mlp_evaluator.h
index 7085be79cdc900c55f9572d61f15b515ed3d6747..f56b7b28546995fa39a44791d10489ca29f630b4 100644
--- a/modules/prediction/evaluator/vehicle/mlp_evaluator.h
+++ b/modules/prediction/evaluator/vehicle/mlp_evaluator.h
@@ -17,15 +17,15 @@
 #ifndef MODULES_PREDICTION_EVALUATOR_VEHICLE_MLP_EVALUATOR_H_
 #define MODULES_PREDICTION_EVALUATOR_VEHICLE_MLP_EVALUATOR_H_
 
-#include <vector>
-#include <unordered_map>
-#include <string>
 #include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
-#include "modules/prediction/evaluator/evaluator.h"
 #include "modules/prediction/container/obstacles/obstacle.h"
-#include "modules/prediction/proto/lane_graph.pb.h"
+#include "modules/prediction/evaluator/evaluator.h"
 #include "modules/prediction/proto/fnn_vehicle_model.pb.h"
+#include "modules/prediction/proto/lane_graph.pb.h"
 
 namespace apollo {
 namespace prediction {
diff --git a/modules/prediction/evaluator/vehicle/mlp_evaluator_test.cc b/modules/prediction/evaluator/vehicle/mlp_evaluator_test.cc
index 0fded2faf7cdd15e82119e82c7e3f6257b6be0ed..099a95ae9b5958cc3180e251339ea974384791e0 100644
--- a/modules/prediction/evaluator/vehicle/mlp_evaluator_test.cc
+++ b/modules/prediction/evaluator/vehicle/mlp_evaluator_test.cc
@@ -21,21 +21,21 @@
 
 #include "gtest/gtest.h"
 
-#include "modules/perception/proto/perception_obstacle.pb.h"
-#include "modules/prediction/common/prediction_gflags.h"
 #include "modules/common/util/file.h"
+#include "modules/prediction/common/prediction_gflags.h"
 #include "modules/prediction/container/obstacles/obstacle.h"
 #include "modules/prediction/container/obstacles/obstacles_container.h"
+#include "modules/perception/proto/perception_obstacle.pb.h"
 
 namespace apollo {
 namespace prediction {
 
 class MLPEvaluatorTest : public ::testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     std::string file =
       "modules/prediction/testdata/single_perception_vehicle_onlane.pb.txt";
-    apollo::common::util::GetProtoFromFile(file, &perception_obstacles_);
+    CHECK(apollo::common::util::GetProtoFromFile(file, &perception_obstacles_));
     FLAGS_map_file = "modules/prediction/testdata/kml_map.bin";
   }
  protected:
diff --git a/modules/prediction/prediction.cc b/modules/prediction/prediction.cc
index 27df4197431f35123b87b6b40c718553355f8248..2477009947c782ffe620cb56b7a4744ba75f4b67 100644
--- a/modules/prediction/prediction.cc
+++ b/modules/prediction/prediction.cc
@@ -69,11 +69,8 @@ Status Prediction::Init() {
   EvaluatorManager::instance()->Init(prediction_conf_);
   PredictorManager::instance()->Init(prediction_conf_);
 
-  CHECK(AdapterManager::GetLocalization())
-      << "Localization is not ready.";
-
-  CHECK(AdapterManager::GetPerceptionObstacles())
-      << "Perception is not ready.";
+  CHECK(AdapterManager::GetLocalization()) << "Localization is not ready.";
+  CHECK(AdapterManager::GetPerceptionObstacles()) << "Perception is not ready.";
 
   // Set perception obstacle callback function
   AdapterManager::SetPerceptionObstaclesCallback(&Prediction::OnPerception,
diff --git a/modules/prediction/predictor/pedestrian/regional_predictor.cc b/modules/prediction/predictor/pedestrian/regional_predictor.cc
index 283592a597e2330824cc906ba165182433d101fe..11b0e149fcca3d608f7b7ec9525f1bdf715e303c 100644
--- a/modules/prediction/predictor/pedestrian/regional_predictor.cc
+++ b/modules/prediction/predictor/pedestrian/regional_predictor.cc
@@ -14,11 +14,12 @@
  * limitations under the License.
  *****************************************************************************/
 
-#include <limits>
+#include "modules/prediction/predictor/pedestrian/regional_predictor.h"
+
 #include <cmath>
+#include <limits>
 #include <utility>
 
-#include "modules/prediction/predictor/pedestrian/regional_predictor.h"
 #include "modules/prediction/common/prediction_util.h"
 #include "modules/prediction/common/prediction_gflags.h"
 #include "modules/common/math/kalman_filter.h"
@@ -154,8 +155,8 @@ void RegionalPredictor::GenerateMovingTrajectory(
   std::vector<TrajectoryPoint> right_points;
 
   DrawMovingTrajectory(position, velocity, acc,
-      obstacle->kf_pedestrian_tracker(), total_time,
-      &left_points, &right_points);
+                       obstacle->kf_pedestrian_tracker(), total_time,
+                       &left_points, &right_points);
   int start_index = GetTrajectorySize();
 
   Trajectory left_trajectory;
diff --git a/modules/prediction/predictor/predictor.cc b/modules/prediction/predictor/predictor.cc
index 45bc55b6604f4d3004121a27fe5c8c9492b3d5e1..d6943ba2c7b1e3824166df74080abf024b9274e5 100644
--- a/modules/prediction/predictor/predictor.cc
+++ b/modules/prediction/predictor/predictor.cc
@@ -32,19 +32,14 @@ int Predictor::GetTrajectorySize() {
 void Predictor::GenerateTrajectory(
     const std::vector<::apollo::common::TrajectoryPoint>& points,
     Trajectory* trajectory) {
-  if (points.size() <= 0) {
-    return;
-  }
-
-  for (const auto& point : points) {
-    trajectory->add_trajectory_point()->CopyFrom(point);
-  }
+  trajectory->mutable_trajectory_point()->MergeFrom(
+      {points.begin(), points.end()});
 }
 
 void Predictor::SetEqualProbability(double probability, int start_index) {
   int num = GetTrajectorySize();
-  if (start_index >= 0 && num > 0 && num > start_index) {
-    probability = probability / static_cast<double>(num - start_index);
+  if (start_index >= 0 && num > start_index) {
+    probability /= static_cast<double>(num - start_index);
     for (int i = start_index; i < num; ++i) {
       prediction_obstacle_.mutable_trajectory(i)->set_probability(probability);
     }
diff --git a/modules/prediction/predictor/predictor_factory.cc b/modules/prediction/predictor/predictor_factory.cc
index 5c628feecc10f745a41780af076993cd7d31ade8..a0bb46fadf05342a1b6d9569abea87e0a38b10fb 100644
--- a/modules/prediction/predictor/predictor_factory.cc
+++ b/modules/prediction/predictor/predictor_factory.cc
@@ -16,10 +16,9 @@
 
 #include "modules/prediction/predictor/predictor_factory.h"
 
-#include "modules/prediction/predictor/vehicle/lane_sequence_predictor.h"
-#include "modules/prediction/predictor/vehicle/free_move_predictor.h"
-
 #include "modules/common/log.h"
+#include "modules/prediction/predictor/vehicle/free_move_predictor.h"
+#include "modules/prediction/predictor/vehicle/lane_sequence_predictor.h"
 
 namespace apollo {
 namespace prediction {
diff --git a/modules/prediction/predictor/predictor_manager.cc b/modules/prediction/predictor/predictor_manager.cc
index 2a62cf6c29000f9c9acfe6ccd23036f2c255adfa..ec9d32fa63e16cb0084b502ed6210b78cfef1024 100644
--- a/modules/prediction/predictor/predictor_manager.cc
+++ b/modules/prediction/predictor/predictor_manager.cc
@@ -14,10 +14,10 @@
  * limitations under the License.
  *****************************************************************************/
 
-#include <memory>
-
 #include "modules/prediction/predictor/predictor_manager.h"
 
+#include <memory>
+
 #include "modules/prediction/predictor/vehicle/lane_sequence_predictor.h"
 #include "modules/prediction/predictor/vehicle/free_move_predictor.h"
 #include "modules/prediction/predictor/pedestrian/regional_predictor.h"
@@ -80,15 +80,11 @@ void PredictorManager::Init(const PredictionConf& config) {
 
 Predictor* PredictorManager::GetPredictor(
     const ObstacleConf::PredictorType& type) {
-  if (predictors_.find(type) != predictors_.end()) {
-    return predictors_[type].get();
-  } else {
-    return nullptr;
-  }
+  auto it = predictors_.find(type);
+  return it != predictors_.end() ? it->second.get() : nullptr;
 }
 
-void PredictorManager::Run(
-    const PerceptionObstacles& perception_obstacles) {
+void PredictorManager::Run(const PerceptionObstacles& perception_obstacles) {
   prediction_obstacles_.Clear();
   ObstaclesContainer *container = dynamic_cast<ObstaclesContainer*>(
       ContainerManager::instance()->GetContainer(
diff --git a/modules/prediction/predictor/predictor_manager.h b/modules/prediction/predictor/predictor_manager.h
index 19bb8195f21a74df64104c0ea4c58081586da2d5..c2470786304f5cb4af4aa82a0d847ac08ab09e32 100644
--- a/modules/prediction/predictor/predictor_manager.h
+++ b/modules/prediction/predictor/predictor_manager.h
@@ -22,7 +22,6 @@
 #ifndef MODULES_PREDICTION_PREDICTOR_PREDICTOR_MANAGER_H_
 #define MODULES_PREDICTION_PREDICTOR_PREDICTOR_MANAGER_H_
 
-#include <unordered_map>
 #include <map>
 #include <memory>
 
@@ -92,8 +91,7 @@ class PredictorManager {
   void RegisterPredictors();
 
  private:
-  std::map<ObstacleConf::PredictorType,
-      std::unique_ptr<Predictor>> predictors_;
+  std::map<ObstacleConf::PredictorType, std::unique_ptr<Predictor>> predictors_;
 
   ObstacleConf::PredictorType vehicle_on_lane_predictor_ =
       ObstacleConf::LANE_SEQUENCE_PREDICTOR;
diff --git a/modules/prediction/predictor/predictor_manager_test.cc b/modules/prediction/predictor/predictor_manager_test.cc
index e85bf9eb69d31a950614a7c6f23c8f984ede7410..abcefb962de51ce0ed170bab6713f2c3b34d6ad9 100644
--- a/modules/prediction/predictor/predictor_manager_test.cc
+++ b/modules/prediction/predictor/predictor_manager_test.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  *****************************************************************************/
 
+#include "modules/prediction/predictor/predictor_manager.h"
+
 #include <string>
 
 #include "gtest/gtest.h"
-
-#include "modules/prediction/predictor/predictor_manager.h"
 #include "modules/prediction/proto/prediction_conf.pb.h"
 #include "modules/common/util/file.h"
 
@@ -27,7 +27,7 @@ namespace prediction {
 
 class PredictorManagerTest : public ::testing::Test {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     manager_ = PredictorManager::instance();
   }
 
@@ -38,10 +38,8 @@ class PredictorManagerTest : public ::testing::Test {
 
 TEST_F(PredictorManagerTest, GetPredictor) {
   std::string conf_file = "modules/prediction/testdata/prediction_conf.pb.txt";
-  bool ret_load_conf = ::apollo::common::util::GetProtoFromFile(conf_file,
-                                                                &conf_);
-  EXPECT_TRUE(ret_load_conf);
-  EXPECT_TRUE(conf_.IsInitialized());
+  CHECK(apollo::common::util::GetProtoFromFile(conf_file, &conf_))
+      << "Failed to load " << conf_file;
 
   manager_->Init(conf_);
 
diff --git a/modules/prediction/predictor/vehicle/free_move_predictor.cc b/modules/prediction/predictor/vehicle/free_move_predictor.cc
index 2cae6050cd38b43742b3d25947bfe98f7d62a5dc..b116d00676ee06dd74aaf1119b327a62c383aab4 100644
--- a/modules/prediction/predictor/vehicle/free_move_predictor.cc
+++ b/modules/prediction/predictor/vehicle/free_move_predictor.cc
@@ -16,10 +16,10 @@
 
 #include "modules/prediction/predictor/vehicle/free_move_predictor.h"
 
-#include <vector>
 #include <cmath>
 #include <limits>
 #include <utility>
+#include <vector>
 #include "Eigen/Dense"
 
 #include "modules/prediction/common/prediction_gflags.h"
@@ -114,13 +114,13 @@ void FreeMovePredictor::DrawFreeMoveTrajectoryPoints(
   for (size_t i = 0; i < static_cast<size_t>(total_time / freq); ++i) {
     double speed = std::hypot(v_x, v_y);
     if (speed <= std::numeric_limits<double>::epsilon()) {
-        speed = 0.0;
-        v_x = 0.0;
-        v_y = 0.0;
-        acc_x = 0.0;
-        acc_y = 0.0;
+      speed = 0.0;
+      v_x = 0.0;
+      v_y = 0.0;
+      acc_x = 0.0;
+      acc_y = 0.0;
     } else if (speed > FLAGS_max_speed) {
-        speed = FLAGS_max_speed;
+      speed = FLAGS_max_speed;
     }
 
     // update theta
diff --git a/modules/prediction/predictor/vehicle/free_move_predictor_test.cc b/modules/prediction/predictor/vehicle/free_move_predictor_test.cc
index 787749bf20db7292bdeab24cb3cbd0885b94cce0..5c1c518c5847b0dae0f9c810d9fc0e4d93770f70 100644
--- a/modules/prediction/predictor/vehicle/free_move_predictor_test.cc
+++ b/modules/prediction/predictor/vehicle/free_move_predictor_test.cc
@@ -36,7 +36,7 @@ class FreeMovePredictorTest : public ::testing::Test {
   virtual void SetUp() {
     std::string file =
       "modules/prediction/testdata/single_perception_vehicle_offlane.pb.txt";
-    apollo::common::util::GetProtoFromFile(file, &perception_obstacles_);
+    CHECK(apollo::common::util::GetProtoFromFile(file, &perception_obstacles_));
     FLAGS_map_file = "modules/prediction/testdata/kml_map.bin";
     FLAGS_p_var = 0.1;
     FLAGS_q_var = 0.01;