Improve print format