Fixing table definition + format code.