Some suggestions to the simplify branch
#3939
+30
−24
Merged
simplify branch
#3939