Refactorings according to new headers format in .csv files