Removed headerRows in favor of direct access to rowStartIndex + polishing