diff --git a/rdlink.sh b/rdlink.sh
index 03a5a11..4b8eb37 100755
--- a/rdlink.sh
+++ b/rdlink.sh
@@ -16,12 +16,33 @@ set -o pipefail
 
 LOG_LEVEL="${LOG_LEVEL:-1}" # 7 = debug -> 0 = emergency
 
+function rl::log () {
+  local log_level="${1:-${LOG_LEVEL}}"
+  shift
+
+  # all remaining arguments are to be printed
+  local log_line=""
+
+  while IFS=$'\n' read -r log_line; do
+    printf "%s [%9s] %s\n" "$(date -u +"%Y-%m-%d %H:%M:%S UTC")" "${log_level}" "${log_line}" 1>&2
+  done <<< "${@:-}"
+}
+emergency() {                                  rl::log emergency "${@}"; exit 1; }
+alarm()     { [[ "${LOG_LEVEL:-0}" -ge 1 ]] && rl::log alert "${@}"; true; }
+critical()  { [[ "${LOG_LEVEL:-0}" -ge 2 ]] && rl::log critical "${@}"; true; }
+error()     { [[ "${LOG_LEVEL:-0}" -ge 3 ]] && rl::log error "${@}"; true; }
+warning()   { [[ "${LOG_LEVEL:-0}" -ge 4 ]] && rl::log warning "${@}"; true; }
+notice()    { [[ "${LOG_LEVEL:-0}" -ge 5 ]] && rl::log notice "${@}"; true; }
+info()      { [[ "${LOG_LEVEL:-0}" -ge 6 ]] && rl::log info "${@}"; true; }
+debug()     { [[ "${LOG_LEVEL:-0}" -ge 7 ]] && rl::log debug "${@}"; true; }
+msg()       {                                  echo "$@"; true; }
+
+### Script
 rl::rdlink() {
   local subject=
   local work=
-  local resolved=0
 
-  info "Processing: $@"
+  info "Processing: $*"
   info "  with pwd: $(pwd)"
 
   subject="$(rl::cleanpath "${1:-}")" || true
@@ -29,8 +50,8 @@ rl::rdlink() {
   # Follow multiple symlinks
   while subject="$(rl::quicklink "${subject}")" ; do
     # A link was resolved at least once
-    info "rl::rdlink - Link found: $subject"
-    resolved=1
+    :
+    info "  rl::rdlink - Link found: $subject"
   done
 
   # Special cases handling
@@ -39,7 +60,7 @@ rl::rdlink() {
     # current user has no permission to access the link itself
     # (e.g. /proc/**/cwd)
     if [ -L "${subject}" ] ; then
-      info "rl::rdlink exit - can't access link ${subject}"
+      info "  rl::rdlink exit - can't access link ${subject}"
       printf "\n"
       return 1
     fi
@@ -47,19 +68,14 @@ rl::rdlink() {
 
   # Empty output if (dirname $subject) is not a valid path
   if ! work="$(rl::canon "${subject}")" ; then
-    # Special: Links resolved to something like: /proc/2267178/fd/pipe:[22306727]
-    # are not existing files but `readlink -f` prints result anyway
-    # Printing result if a link was resolved at least once
-    #if (( ! resolved )); then
-      info "rl::rdlink exit - invalid path ${work}"
-      printf "\n"
-      return 1
-    #fi
+    info "  rl::rdlink exit - invalid path ${work}"
+    printf "\n"
+    return 1
   else
     subject="${work}"
   fi
 
-  printf "${subject}\n"
+  printf "%s\n" "${subject}"
 }
 
 rl::quicklink() {
@@ -70,19 +86,19 @@ rl::quicklink() {
 
   # Check if current candidate is a symlink
   if ! subject=$(readlink -- "${1:-}"); then
-    printf -- "${1:-}\n"
+    printf -- "%s\n" "${1:-}"
     return 1
   fi
-  info " - symlink ${1} -> ${subject}"
+  info "  rl::quicklink symlink ${1} -> ${subject}"
 
   # relative symlink target; prepend its parent direcotry
   if [[ "${subject}" != "/"* ]]; then
     work="$(rl::canon "$(dirname -- "${1:-}")")"
     subject="${work}/${subject}"
-    info " - relative link resolved: ${subject}"
+    info "  rl::quicklink relative link resolved: ${subject}"
   fi
 
-  printf "${subject}\n"
+  printf "%s\n" "${subject}"
   return 0
 }
 
@@ -103,7 +119,7 @@ rl::canon() {
       # e.g. $(readlink /proc/self/root) == "/"
       #      $(cd /proc/self/root/mnt && pwd -P) == "//mnt"
       subject="$(rl::normalize "${work}")"
-      info "rl::canon valid directory: ${subject}"
+      info "  rl::canon valid directory: ${subject}"
       run=0
     elif work="$(cd "$(dirname -- "${start}")" >/dev/null 2>&1 && pwd -P)" ; then
       bname="$(basename -- "${start}")"
@@ -112,12 +128,12 @@ rl::canon() {
       [[ "${work}" == "/" ]] && work=
 
       subject="${work}${bname:+"/${bname}"}"
-      info "rl::canon valid parent: ${subject}"
+      info "  rl::canon valid parent: ${subject}"
       # Special: Succeed with valid element after second run; see special below
       # e.g. /root/.
       #      * /root is valid but not accessible
       if (( retval )) && [ -e "${subject}" ] ;then
-        info "rl::canon valid element"
+        info "  rl::canon valid element"
         retval=0
       fi
       run=0
@@ -129,18 +145,18 @@ rl::canon() {
       #      * resolves to pwd but fails by readlink -f
       work="$(rl::normalize "${start}")"
       if [[ "${work}" != "${start}" ]] ; then
-        info "rl::canon retry with: ${work}"
+        info "  rl::canon retry with: ${work}"
         start="${work}"
         retval=1
         continue
       fi
-      info "rl::canon invalid path: ${work}"
+      info "  rl::canon invalid path: ${work}"
       subject="${work}"
       run=0 && retval=1
     fi
   done
 
-  printf -- "${subject}\n"
+  printf -- "%s\n" "${subject}"
   return ${retval}
 }
 
@@ -149,15 +165,15 @@ rl::cleanpath() {
   local rex_tmp=
 
   info "Cleaning path... ${1:-}"
-  
+
   work="${1:-}"
   # Remove multiple /
   while [[ "${work:-}" = *"//"* ]]; do
     work="${work//'//'/'/'}"
   done
-  
-  info "rl::cleanpath result: ${work}"
-  printf -- "${work}\n"
+
+  info "  rl::cleanpath result: ${work}"
+  printf -- "%s\n" "${work}"
 }
 
 rl::normalize() {
@@ -187,8 +203,8 @@ rl::normalize() {
     work="${BASH_REMATCH[1]}"
   fi
 
-  info "rl::normalize result: ${work}"
-  printf -- "${work}\n"
+  info "  rl::normalize result: ${work}"
+  printf -- "%s\n" "${work}"
 }
 
 rl::main() {
@@ -218,31 +234,9 @@ rl::main() {
   done
 }
 
-function rl::log () {
-  local log_level="${1:-${LOG_LEVEL}}"
-  shift
-
-  # all remaining arguments are to be printed
-  local log_line=""
-
-  while IFS=$'\n' read -r log_line; do
-    printf "%s [%9s] %s\n" "$(date -u +"%Y-%m-%d %H:%M:%S UTC")" "${log_level}" "${log_line}" 1>&2
-  done <<< "${@:-}"
-}
-emergency() {                                  rl::log emergency "${@}"; exit 1; }
-alarm()     { [[ "${LOG_LEVEL:-0}" -ge 1 ]] && rl::log alert "${@}"; true; }
-critical()  { [[ "${LOG_LEVEL:-0}" -ge 2 ]] && rl::log critical "${@}"; true; }
-error()     { [[ "${LOG_LEVEL:-0}" -ge 3 ]] && rl::log error "${@}"; true; }
-warning()   { [[ "${LOG_LEVEL:-0}" -ge 4 ]] && rl::log warning "${@}"; true; }
-notice()    { [[ "${LOG_LEVEL:-0}" -ge 5 ]] && rl::log notice "${@}"; true; }
-info()      { [[ "${LOG_LEVEL:-0}" -ge 6 ]] && rl::log info "${@}"; true; }
-debug()     { [[ "${LOG_LEVEL:-0}" -ge 7 ]] && rl::log debug "${@}"; true; }
-msg()       {                                  echo "$@"; true; }
-
-
 # Provide as function to be called when sourced
 rdlink() {
-  rl::rdlink "$@"
+  rl::main "$@"
 }
 
 ### Check if script is _sourced
@@ -251,7 +245,8 @@ _sourced=0
 if [ -n "${ZSH_EVAL_CONTEXT:-}" ]; then
   case ${ZSH_EVAL_CONTEXT:-} in *:file) _sourced=1;; esac
 elif [ -n "${KSH_VERSION:-}" ]; then
-  [ "$(cd $(dirname -- $0) && pwd -P)/$(basename -- $0)" != "$(cd $(dirname -- ${.sh.file}) && pwd -P)/$(basename -- ${.sh.file})" ] && _sourced=1
+  [ "$(cd "$(dirname -- "$0")" && pwd -P)/$(basename -- "$0")" \
+    != "$(cd "$(dirname -- "${.sh.file}")" && pwd -P)/$(basename -- "${.sh.file}")" ] && _sourced=1
 elif [ -n "${BASH_VERSION:-}" ]; then
   (return 0 2>/dev/null) && _sourced=1
 else # All other shells: examine $0 for known shell binary filenames
@@ -264,3 +259,5 @@ if (( ! _sourced )); then
   rl::main "$@"
 fi
 
+### Script EOF
+