Refactoring
Done to tables