fix table name and formatting