Refactoring: new util namespace