Added z script and fixed whitespace issues globally