[Zhiheng] clean code.