diff --git a/lib/linter.sh b/lib/linter.sh
index b3071780..c489a260 100755
--- a/lib/linter.sh
+++ b/lib/linter.sh
@@ -21,82 +21,81 @@ source /action/lib/worker.sh # Source the function script(s)
 ###########
 # GLOBALS #
 ###########
+# Default Vars
+DEFAULT_RULES_LOCATION='/action/lib/.automation'                            # Default rules files location
 # Ansible Vars
-ANSIBLE_FILE_NAME='.ansible-lint.yml'                                   # Name of the file
-ANSIBLE_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${ANSIBLE_FILE_NAME}"   # Path to the Ansible lint rules
+ANSIBLE_FILE_NAME='.ansible-lint.yml'                                       # Name of the file
+ANSIBLE_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${ANSIBLE_FILE_NAME}"       # Path to the Ansible lint rules
 # Azure Resource Manager Vars
-ARM_FILE_NAME='.arm-ttk.psd1'                                           # Name of the file
-ARM_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${ARM_FILE_NAME}"           # Path to the ARM lint rules
+ARM_FILE_NAME='.arm-ttk.psd1'                                               # Name of the file
+ARM_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${ARM_FILE_NAME}"               # Path to the ARM lint rules
 # Cloudformation Vars
-CFN_FILE_NAME='.cfnlintrc.yml'                                          # Name of the file
+CFN_FILE_NAME='.cfnlintrc.yml'                                              # Name of the file
 CFN_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${CFN_FILE_NAME}"               # Path to the cloudformation lint rules
 # Clojure Vars
-CLOJURE_FILE_NAME='.clj-kondo/config.edn'                               # Name of the file
+CLOJURE_FILE_NAME='.clj-kondo/config.edn'                                   # Name of the file
 CLOJURE_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${CLOJURE_FILE_NAME}"       # Path to the Clojure lint rules
 # Coffee Vars
+COFFEE_FILE_NAME='.coffee-lint.json'                                        # Name of the file
 COFFEESCRIPT_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${COFFEE_FILE_NAME}"   # Path to the coffeescript lint rules
-COFFEE_FILE_NAME='.coffee-lint.json'                                    # Name of the file
 # CSS Vars
-CSS_FILE_NAME='.stylelintrc.json'                                       # Name of the file
+CSS_FILE_NAME='.stylelintrc.json'                                           # Name of the file
 CSS_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${CSS_FILE_NAME}"               # Path to the CSS lint rules
 # Dart Vars
-DART_FILE_NAME='analysis_options.yaml'                                  # Name of the file
+DART_FILE_NAME='analysis_options.yaml'                                      # Name of the file
 DART_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${DART_FILE_NAME}"             # Path to the DART lint rules
-# Default Vars
-DEFAULT_RULES_LOCATION='/action/lib/.automation'                        # Default rules files location
 # Docker Vars
-DOCKER_FILE_NAME='.dockerfilelintrc'                                    # Name of the file
+DOCKER_FILE_NAME='.dockerfilelintrc'                                        # Name of the file
 DOCKER_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${DOCKER_FILE_NAME}"         # Path to the Docker lint rules
 # Golang Vars
-GO_FILE_NAME='.golangci.yml'                                            # Name of the file
+GO_FILE_NAME='.golangci.yml'                                                # Name of the file
 GO_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${GO_FILE_NAME}"                 # Path to the Go lint rules
 # HTML Vars
-HTML_FILE_NAME='.htmlhintrc'                                            # Name of the file
+HTML_FILE_NAME='.htmlhintrc'                                                # Name of the file
 HTML_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${HTML_FILE_NAME}"             # Path to the CSS lint rules
 # Javascript Vars
-JAVASCRIPT_FILE_NAME="${JAVASCRIPT_ES_CONFIG_FILE:-.eslintrc.yml}"      # Name of the file
+JAVASCRIPT_FILE_NAME="${JAVASCRIPT_ES_CONFIG_FILE:-.eslintrc.yml}"          # Name of the file
 JAVASCRIPT_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${JAVASCRIPT_FILE_NAME}" # Path to the Javascript lint rules
-JAVASCRIPT_STANDARD_LINTER_RULES=''                                     # ENV string to pass when running js standard
+JAVASCRIPT_STANDARD_LINTER_RULES=''                                         # ENV string to pass when running js standard
 # Default linter path
-LINTER_RULES_PATH="${LINTER_RULES_PATH:-.github/linters}"               # Linter Path Directory
+LINTER_RULES_PATH="${LINTER_RULES_PATH:-.github/linters}"                   # Linter Path Directory
 # MD Vars
-MARKDOWN_FILE_NAME='.markdown-lint.yml'                                 # Name of the file
+MARKDOWN_FILE_NAME='.markdown-lint.yml'                                     # Name of the file
 MARKDOWN_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${MARKDOWN_FILE_NAME}"     # Path to the markdown lint rules
 # OpenAPI Vars
-OPENAPI_FILE_NAME='.openapirc.yml'                                      # Name of the file
+OPENAPI_FILE_NAME='.openapirc.yml'                                          # Name of the file
 OPENAPI_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${OPENAPI_FILE_NAME}"       # Path to the OpenAPI lint rules
 # Powershell Vars
-POWERSHELL_FILE_NAME='.powershell-psscriptanalyzer.psd1'                # Name of the file
+POWERSHELL_FILE_NAME='.powershell-psscriptanalyzer.psd1'                    # Name of the file
 POWERSHELL_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${POWERSHELL_FILE_NAME}" # Path to the Powershell lint rules
 # Protocol Buffers Vars
-PROTOBUF_FILE_NAME='.protolintrc.yml'                                   # Name of the file
+PROTOBUF_FILE_NAME='.protolintrc.yml'                                       # Name of the file
 PROTOBUF_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${PROTOBUF_FILE_NAME}"     # Path to the Protocol Buffers lint rules
 # Python Vars
-PYTHON_FILE_NAME='.python-lint'                                         # Name of the file
+PYTHON_FILE_NAME='.python-lint'                                             # Name of the file
 PYTHON_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${PYTHON_FILE_NAME}"         # Path to the python lint rules
 # Ruby Vars
-RUBY_FILE_NAME="${RUBY_CONFIG_FILE:-.ruby-lint.yml}"                    # Name of the file
+RUBY_FILE_NAME="${RUBY_CONFIG_FILE:-.ruby-lint.yml}"                        # Name of the file
 RUBY_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${RUBY_FILE_NAME}"             # Path to the ruby lint rules
 # Terraform Vars
-TERRAFORM_FILE_NAME='.tflint.hcl'                                       # Name of the file
+TERRAFORM_FILE_NAME='.tflint.hcl'                                           # Name of the file
 TERRAFORM_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${TERRAFORM_FILE_NAME}"   # Path to the Terraform lint rules
 # Typescript Vars
-TYPESCRIPT_FILE_NAME="${TYPESCRIPT_ES_CONFIG_FILE:-.eslintrc.yml}"      # Name of the file
+TYPESCRIPT_FILE_NAME="${TYPESCRIPT_ES_CONFIG_FILE:-.eslintrc.yml}"          # Name of the file
 TYPESCRIPT_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${TYPESCRIPT_FILE_NAME}" # Path to the Typescript lint rules
-TYPESCRIPT_STANDARD_LINTER_RULES=''                                     # ENV string to pass when running js standard
+TYPESCRIPT_STANDARD_LINTER_RULES=''                                         # ENV string to pass when running js standard
 # YAML Vars
-YAML_FILE_NAME='.yaml-lint.yml'                                         # Name of the file
+YAML_FILE_NAME='.yaml-lint.yml'                                             # Name of the file
 YAML_LINTER_RULES="${DEFAULT_RULES_LOCATION}/${YAML_FILE_NAME}"             # Path to the yaml lint rules
 
-
 #######################################
 # Linter array for information prints #
 #######################################
-LINTER_ARRAY=('ansible-lint' 'arm-ttk' 'asl-validator' 'cfn-lint' 'clj-kondo' 'coffeelint'
-  'dart' 'dockerfilelint' 'dotenv-linter' 'eslint' 'golangci-lint' 'htmlhint'
-  'jsonlint' 'ktlint' 'markdownlint' 'perl' 'protolint' 'pwsh' 'pylint'
-  'raku' 'rubocop' 'shellcheck' 'spectral' 'standard' 'stylelint' 'tflint'
-  'xmllint' 'yamllint')
+LINTER_ARRAY=('ansible-lint' 'arm-ttk' 'asl-validator' 'cfn-lint' 'clj-kondo'
+  'coffeelint' 'dart' 'dockerfilelint' 'dotenv-linter' 'eslint' 'golangci-lint'
+  'htmlhint' 'jsonlint' 'ktlint' 'markdownlint' 'perl' 'protolint' 'pwsh'
+  'pylint' 'raku' 'rubocop' 'shellcheck' 'spectral' 'standard' 'stylelint'
+  'tflint' 'xmllint' 'yamllint')
 
 #############################
 # Language array for prints #
@@ -105,8 +104,8 @@ LANGUAGE_ARRAY=('ANSIBLE' 'ARM' 'BASH' 'CFN' 'CLOJURE' 'COFFEESCRIPT'
   'CSS' 'DART' 'DOCKER' 'ENV' 'GO' 'HTML' 'JAVASCRIPT_ES'
   'JAVASCRIPT_STANDARD' 'JSON' 'JSX' 'KOTLIN' 'MARKDOWN' 'OPENAPI'
   'PERL' 'PHP' 'POWERSHELL' 'PROTOBUF' 'PYTHON'
-  'RAKU' 'RUBY' 'STATES' 'TERRAFORM' 'TSX' 'TYPESCRIPT_ES' 'TYPESCRIPT_STANDARD'
-  'XML' 'YML')
+  'RAKU' 'RUBY' 'STATES' 'TERRAFORM' 'TSX' 'TYPESCRIPT_ES'
+  'TYPESCRIPT_STANDARD' 'XML' 'YML')
 
 ############################################
 # Array for all languages that were linted #
@@ -171,10 +170,10 @@ ACTIONS_RUNNER_DEBUG="${ACTIONS_RUNNER_DEBUG:-false}" # Boolean to see even more
 ################
 # Default Vars #
 ################
-DEFAULT_VALIDATE_ALL_CODEBASE='true'                # Default value for validate all files
-DEFAULT_WORKSPACE="${DEFAULT_WORKSPACE:-/tmp/lint}" # Default workspace if running locally
-DEFAULT_RUN_LOCAL='false'                           # Default value for debugging locally
-DEFAULT_TEST_CASE_RUN='false'                       # Flag to tell code to run only test cases
+DEFAULT_VALIDATE_ALL_CODEBASE='true'                  # Default value for validate all files
+DEFAULT_WORKSPACE="${DEFAULT_WORKSPACE:-/tmp/lint}"   # Default workspace if running locally
+DEFAULT_RUN_LOCAL='false'                             # Default value for debugging locally
+DEFAULT_TEST_CASE_RUN='false'                         # Flag to tell code to run only test cases
 DEFAULT_IFS="${IFS}"                                  # Get the Default IFS for updating
 
 ###############################################################
@@ -188,7 +187,7 @@ READ_ONLY_CHANGE_FLAG=0                                      # Flag set to 1 if
 echo "${READ_ONLY_CHANGE_FLAG}" > /dev/null 2>&1 || true     # Workaround SC2034
 TEST_CASE_FOLDER='.automation/test'                          # Folder for test cases we should always ignore
 echo "${TEST_CASE_FOLDER}" > /dev/null 2>&1 || true          # Workaround SC2034
-DEFAULT_ANSIBLE_DIRECTORY="${GITHUB_WORKSPACE}/ansible"        # Default Ansible Directory
+DEFAULT_ANSIBLE_DIRECTORY="${GITHUB_WORKSPACE}/ansible"      # Default Ansible Directory
 echo "${DEFAULT_ANSIBLE_DIRECTORY}" > /dev/null 2>&1 || true # Workaround SC2034
 WARNING_ARRAY_TEST=()                                        # Array of warning linters that did not have an expected test result.
 echo "${WARNING_ARRAY_TEST[*]}" > /dev/null 2>&1 || true     # Workaround SC2034
@@ -199,7 +198,7 @@ echo "${WARNING_ARRAY_TEST[*]}" > /dev/null 2>&1 || true     # Workaround SC2034
 OUTPUT_FORMAT="${OUTPUT_FORMAT}"                             # Output format to be generated. Default none
 OUTPUT_FOLDER="${OUTPUT_FOLDER:-super-linter.report}"        # Folder where the reports are generated. Default super-linter.report
 OUTPUT_DETAILS="${OUTPUT_DETAILS:-simpler}"                  # What level of details. (simpler or detailed). Default simpler
-REPORT_OUTPUT_FOLDER="${DEFAULT_WORKSPACE}/${OUTPUT_FOLDER}"
+REPORT_OUTPUT_FOLDER="${DEFAULT_WORKSPACE}/${OUTPUT_FOLDER}" # Location for the report folder
 
 ##########################
 # Array of changed files #
diff --git a/lib/worker.sh b/lib/worker.sh
index 1f461542..f5957f4e 100755
--- a/lib/worker.sh
+++ b/lib/worker.sh
@@ -216,8 +216,8 @@ function LintCodebase() {
         # Error #
         #########
         echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [${LINTER_NAME}] linter!${NC}"
-        echo -e "${NC}${B[R]}${F[W]}Command run:${NC}[\$${LINT_CMD}]${NC}"
         echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${LINT_CMD}]${NC}"
+        echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[${LINTER_COMMAND} ${FILE}]${NC}"
         # Increment the error count
         (("ERRORS_FOUND_${FILE_TYPE}++"))
 
@@ -432,7 +432,6 @@ function TestCodebase() {
         # Error #
         #########
         echo -e "${NC}${B[R]}${F[W]}ERROR!${NC} Found errors in [${LINTER_NAME}] linter!${NC}"
-        echo -e "${NC}${B[R]}${F[W]}Command run:${NC}[\$${LINT_CMD}]${NC}"
         echo -e "${NC}${B[R]}${F[W]}ERROR:${NC}[${LINT_CMD}]${NC}"
         echo -e "${NC}${B[R]}${F[W]}ERROR:${NC} Linter CMD:[${LINTER_COMMAND} ${FILE}]${NC}"
         # Increment the error count