Cleanup
Moved pattern converter to helpers