Some corrections and remove data printing