Beautify and no more 0 value IVs