Move common code to a common ancestor
Fix comment
Merge pull request #548 from kasunchathuranga/hideTables

Move common code to a common ancestor