Improve readability
Add include guard for table