Linting had some issues with regex and callbacks