diff --git a/code_standard_violation_checker.sh b/code_standard_violation_checker.sh
index 1f35595f7f..45d3302843 100755
--- a/code_standard_violation_checker.sh
+++ b/code_standard_violation_checker.sh
@@ -3,23 +3,19 @@
 # shellcheck disable=SC2069
 if command -v rg
 then
-  # GREP_PROG='rg --pcre2'
-  GREP_PROG='rg'
+  GREP_PROG='rg --pcre2'
 else
-  # GREP_PROG='grep -r --perl-regexp --color --include *.java'
-  GREP_PROG='grep -r --color --include *.java'
+  GREP_PROG='grep -r --perl-regexp --color --include *.java -M'
 fi
 
 PRINT_OUTPUT=$([ "$1" == "-p" ] && echo true || echo false)
 
-# BOOLEAN_VIOLATION='(?<!@) boolean [^is|^are|^has|^should]'
-BOOLEAN_VIOLATION='^[^@]* boolean [^is|^are|^has|^should]'
+BOOLEAN_VIOLATION='(?:^[^@]*)boolean [^is|^are|^has|^should]'
 BOOLEAN_VIOLATION_COUNT=$($GREP_PROG "$BOOLEAN_VIOLATION" src | wc -l)
 [ "$PRINT_OUTPUT" == true ] && $GREP_PROG "$BOOLEAN_VIOLATION" src
 echo "$BOOLEAN_VIOLATION_COUNT" boolean naming violations found.
 
-# '(?<=\*) @.* .*$'
-NO_PERIOD_VIOLATION='\* @.*[^\.]$'
+NO_PERIOD_VIOLATION='\* @.*[^,.:]$'
 NO_PERIOD_VIOLATION_COUNT=$($GREP_PROG "$NO_PERIOD_VIOLATION" src | wc -l)
 [ "$PRINT_OUTPUT" == true ] && $GREP_PROG "$NO_PERIOD_VIOLATION" src
 echo "$NO_PERIOD_VIOLATION_COUNT" Javadoc punctuation violations found.