Table class fix part 2

I added your suggestions