Small refactoring on naming vars and functs
Add group regexp util