diff --git a/.bashrc b/.bashrc
index a3e5792..c4b0758 100644
--- a/.bashrc
+++ b/.bashrc
@@ -68,6 +68,20 @@ _lori_completion() {
 }
 
 complete -F _lori_completion lori
+myalias() {
+  local RED=$(tput setaf 1)
+  local GREEN=$(tput setaf 2)
+  local normal=$(tput sgr0)
+  echo "My custom aliases:"
+  printf "%-20s %s\n" "Alias" "Command"
+  echo "------------------------------"
+  for key in $(cat ~/.dotfiles/alias/bash_aliases | awk '{print $2}' | awk -F"=" '{print $1}'); do
+    command=$(cat ~/.dotfiles/alias/bash_aliases | grep "${key}" | awk -F"=" '{print $2}')
+    printf "%-20s %s\n" "${RED}$key${normal}" "${GREEN}$command${normal}"
+done | sort
+return 0
+}
+complete -F myalias
 # load bash alias
 if [ -f ~/.dotfiles/bash_aliases ]; then
 . ~/.dotfiles/.bash_aliases
diff --git a/.zshrc b/.zshrc
index 05d6591..9e3fb4d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -91,8 +91,8 @@ myalias() {
   echo "My custom aliases:"
   printf "%-20s %s\n" "Alias" "Command"
   echo "------------------------------"
-  for key in $(cat ~/.dotfiles/alias/zsh_aliases| awk '{print $2}' | awk -F"=" '{print $1}'); do
-    command=$(cat ~/.dotfiles/alias/zsh_aliases| grep "${key}" | awk -F"=" '{print $2}')
+  for key in $(cat ~/.dotfiles/alias/zsh_aliases | awk '{print $2}' | awk -F"=" '{print $1}'); do
+    command=$(cat ~/.dotfiles/alias/zsh_aliases | grep "${key}" | awk -F"=" '{print $2}')
     printf "%-20s %s\n" "${RED}$key${normal}" "${GREEN}$command${normal}"
 done | sort
 return 0
diff --git a/alias/bash_aliases b/alias/bash_aliases
index 5c19787..89dcb5e 100644
--- a/alias/bash_aliases
+++ b/alias/bash_aliases
@@ -1,13 +1,10 @@
 alias af="cd /home/h0lik/dev/ansible"
-# Start/Stop VM ansible
 alias agup="sudo virsh start ansible"
 alias agdown="sudo virsh shutdown ansible"
-#Connect SSH ansible-gateway
 alias assh="ssh ansible"
 alias devsrv="ssh worksrv"
 alias grep="grep --color=auto"
 alias host-ssh="/home/h0lik/.bin/./ssh-host.sh"
-# Git Alias bash 
 alias ga="git add"
 alias gc="git commit -m"
 alias gp="git push -u"