Refactoring zshrc for clarity