Fix column headers
Refactor computeDetailedResults