- [refactor] some refactoring.