Simplified the tables (closes #153)