Cleaned up table creation.