Refactoring TableParser