Utils class added, refactoring