Cleanup,

remove some comments and change the order I set stuff in zshrc.