Refactor and -Z option for disable ZSH shell