Cleanup and rename of csv