Cleanup, data-subtype to class, tables with titles and caption

Hopefully I have the directions correct.