Just small refactoring