Utils refactoring, easier reading