add change to CHANGELOG,and mini refactoring