The latter - in example, on page 11 in the description of room S3, I'd move the "1", "2", and "3" to the beginning of the description, rather than after. I'd just find it easier to use at the table that way.
