diff --git a/.gitignore b/.gitignore
index 4edb7e1..7e9ee09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ zsh.d/Darwin/99-local.zsh
 *~
 *.swp
 .DS_Store
+*.dpkg-dist
diff --git a/zsh.d/50-functions.zsh b/zsh.d/50-functions.zsh
index f17dc06..e9d123a 100644
--- a/zsh.d/50-functions.zsh
+++ b/zsh.d/50-functions.zsh
@@ -3,16 +3,4 @@
 #
 # Autoload all functions in zshfunctions
 #
-autoload -U ./zshfunctions/*(.:t)
-
-# # cdb - Goes to folder by complete path
-# autoload -U cdb
-
-# # bak - remove backup files
-# autoload -U bak
-
-# autoload -U x509
-
-# autoload -U awsprofile
-
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
+autoload -U $LIBRARY/zshfunctions/*(.:t)
diff --git a/zsh.d/90-plugins.zsh b/zsh.d/90-plugins.zsh
index 12e183e..1b6be30 100644
--- a/zsh.d/90-plugins.zsh
+++ b/zsh.d/90-plugins.zsh
@@ -1,12 +1,12 @@
 # pyenv
-if type pyenv; then
+if whence pyenv > /dev/null; then
   export PYENV_ROOT="$HOME/.pyenv"
   eval "$(pyenv init --path)"
   eval "$(pyenv init -)"
 fi
 
 # thefuck
-type thefuck && eval $(thefuck --alias)
+whence  thefuck > /dev/null && eval $(thefuck --alias)
 
 #z
-type ./plugins/zsh-z/zsh-z.plugin.zsh && source ./plugins/zsh-z/zsh-z.plugin.zsh
+[ -f $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh ] && source $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh