Improvement on format extraction.