Updating to use replacers

This allows for easier testing and reuse of regex
Fix project reference