Expression regex refactoring