clean up .zshrc and restructure a little