Update some comments and output format