Clean up zsh files for readability and speed of loading