remove namespace, move global functions to Utils class