refactor table parser
refactor table parser