Made small refactoring