Style changes after review

- Revert string interpolation (-- concatenation)
- Revert merging 5 preg_match() calls into 2