Change data format and simplify table
Address errors properly and remove example code