Simplify table

Simplified the table stuff.

@tobstarr please take a look.