util.d refactoring