refuctoring and rearranged zsh settings