minor clean
Merge pull request #2416 from coolwanglu/minor_clean

Minor clean