* small refactoring