Work on format checking