cleaned up table structure