diff --git a/paddle/framework/block_desc.cc b/paddle/framework/block_desc.cc
index 670533a3fe35d9967fe28dfe8a83ffa2ab37b375..01f50e1393606044fb20d5f782fadede46b744e3 100644
--- a/paddle/framework/block_desc.cc
+++ b/paddle/framework/block_desc.cc
@@ -35,8 +35,7 @@ VarDescBind *BlockDescBind::Var(const std::string &name) const {
 }
 
 bool BlockDescBind::HasVar(const std::string &name) const {
-  auto it = vars_.find(name);
-  return it != vars_.end();
+  return vars_.find(name) != vars_.end();
 }
 
 std::vector<VarDescBind *> BlockDescBind::AllVars() const {
diff --git a/paddle/framework/shape_inference.h b/paddle/framework/shape_inference.h
index bc8af0eb3ec7e8685eb7d2734e9b8f75372d1309..74e0371e328114294d7f85932b1e551c21ff5b97 100644
--- a/paddle/framework/shape_inference.h
+++ b/paddle/framework/shape_inference.h
@@ -19,6 +19,9 @@ limitations under the License. */
 namespace paddle {
 namespace framework {
 
+// TODO(longfei): Once after both CompileTimeInferShapeContext and
+// RuntimeInferShapeContext get merged, we can rename InferShapeContextBase into
+// InferShapeContext so to replace the current InferShapeContext.
 class InferShapeContextBase {
  public:
   virtual ~InferShapeContextBase() {}