refactoring Table
Aestetic refactoring for Table
mods