Refactored helper class names to clarify purpose
Removed unnecessary string concatenation
Made change to insert match text if replacement not provided