Refactor & some change "Simple CSV"