Little small refactoring