SWC-775 Code cleanup for table parser