Extracted util fns to separate namespace