Rework the format a little more, adding words and sanity checks