- refactoring
- string data fix