Clean up and improve zshrc