Utils refactoring