Table formatting

Pulling apart the table and rehashing it.