additional performance improvement and refactor of kits.csv