[*] small refactoring done