! small refactoring