+commoet +small refactoring