diff --git a/get_revoked_keys.sh b/get_revoked_keys.sh
index 5caf76f..f9cf6ce 100755
--- a/get_revoked_keys.sh
+++ b/get_revoked_keys.sh
@@ -53,7 +53,7 @@ warn (){
 info (){
    if $terminal ; then
       echo ""
-      echo -e "\t[ \033[32m\033[1mInfo\033[m ]: $*"
+      echo -e "   [ \033[32m\033[1mInfo\033[m ]: $*"
       echo ""
    fi
 }
@@ -67,7 +67,7 @@ info (){
 # - Running in a terminal?
 # -
 if [[ -t 1 ]] ; then
-      terminal=true
+   terminal=true
 else
    terminal=false
 fi
@@ -115,18 +115,27 @@ if [[ ${#revoked_serial_arr[@]} -gt 0 ]]; then
       fi
    done
 else
-   info "No revoked OpenVPN keys exists"
+   info "No revoked OpenVPN keys in \033[1m${KEY_DIR}\033[m exists"
 fi
 
 echo
-for _val in ${revoked_cn_arr[@]} ; do
-   IFS=':' read -a _val_arr <<< "${_val}"
+if [[ ${#revoked_cn_arr[@]} -gt 0 ]]; then
+   echo ""
    if $terminal ; then
-      echo -e "   Serial: \033[1m${_val_arr[0]}\033[m   CN: \033[1m${_val_arr[1]}\033[m"
+      echo -e "Revoked Keys in \033[32m\033[1m${KEY_DIR}\033[m:"
    else
-      echo "   Serial: ${_val_arr[0]}   CN: ${_val_arr[1]}"
+      echo "Revoked Keys in ${KEY_DIR}:"
    fi
-done
+   echo ""
+   for _val in ${revoked_cn_arr[@]} ; do
+      IFS=':' read -a _val_arr <<< "${_val}"
+      if $terminal ; then
+         echo -e "   Serial: \033[1m${_val_arr[0]}\033[m   CN: \033[1m${_val_arr[1]}\033[m"
+      else
+         echo "   Serial: ${_val_arr[0]}   CN: ${_val_arr[1]}"
+      fi
+   done
+fi
 
 echo
 exit