Some printf cleanup