Suggestion: combine both regex for code brevity. Also for 3 other commits.