Refactoring parser table builder