Tables: Aligned with plugin template
Merge pull request #3367 from pjackson28/cleanuptables

Tables: Aligned with plugin template