Move utility to a new module, keep impl clean
Cleanup