Utils class + small refactor