diff --git a/clean_files.txt b/clean_files.txt
index 2b9a870b..cb715e8f 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -91,6 +91,7 @@ plugins/available/history-substring-search.plugin.bash
 plugins/available/history.plugin.bash
 plugins/available/hub.plugin.bash
 plugins/available/jump.plugin.bash
+plugins/available/less-pretty-cat.plugin.bash
 plugins/available/node.plugin.bash
 plugins/available/nodenv.plugin.bash
 plugins/available/percol.plugin.bash
diff --git a/plugins/available/less-pretty-cat.plugin.bash b/plugins/available/less-pretty-cat.plugin.bash
index b6b9d1f0..139e5188 100644
--- a/plugins/available/less-pretty-cat.plugin.bash
+++ b/plugins/available/less-pretty-cat.plugin.bash
@@ -1,31 +1,23 @@
+# shellcheck shell=bash
 cite about-plugin
 about-plugin 'pygmentize instead of cat to terminal if possible'
 
-if $(command -v pygmentize &> /dev/null) ; then
-  # get the full paths to binaries
-  CAT_BIN=$(which cat)
-  LESS_BIN=$(which less)
-  BASH_IT_CCAT_STYLE="${BASH_IT_CCAT_STYLE:=default}"
-  BASH_IT_CLESS_STYLE="${BASH_IT_CLESS_STYLE:=default}"
+_command_exists pygmentize || return
 
-  # pigmentize cat and less outputs - call them ccat and cless to avoid that
-  # especially cat'ed output in scripts gets mangled with pygemtized meta characters
-  function ccat()
-  {
-      about 'runs either pygmentize or cat on each file passed in'
-      param '*: files to concatenate (as normally passed to cat)'
-      example 'cat mysite/manage.py dir/text-file.txt'
-      for var;
-      do
-          pygmentize -f 256 -O style="$BASH_IT_CCAT_STYLE" -g "$var" 2>/dev/null || "$CAT_BIN" "$var";
-      done
-  }
+# pigmentize cat and less outputs - call them ccat and cless to avoid that
+# especially cat'ed output in scripts gets mangled with pygemtized meta characters
+function ccat() {
+	about 'runs pygmentize on each file passed in'
+	param '*: files to concatenate (as normally passed to cat)'
+	example 'ccat mysite/manage.py dir/text-file.txt'
 
-  function cless()
-  {
-      about 'it pigments the file passed in and passes it to less for pagination'
-      param '$1: the file to paginate with less'
-      example 'less mysite/manage.py'
-      pygmentize -f 256 -O style="$BASH_IT_CLESS_STYLE" -g $* | "$LESS_BIN" -R
-  }
-fi
+	pygmentize -f 256 -O style="${BASH_IT_CCAT_STYLE:-default}" -g "$@"
+}
+
+function cless() {
+	about 'pigments the files passed in and passes to less for pagination'
+	param '*: the files to paginate with less'
+	example 'cless mysite/manage.py'
+
+	pygmentize -f 256 -O style="${BASH_IT_CLESS_STYLE:-default}" -g "$@" | command less -R
+}