Trivial refactoring: avoid unnecessary regex usage
6 files changed