normalize: comments added, output_format removed