Some finetuning on formats