Rename variables and add showTable