Refactor + Table generation (only header-