CHANGELOG:
* code improvement;