Make small refactoring