Completed base CSV conversion and cleaned up code.