Remove debug output.
Update template regex to include space and _