Clean up + fix csv listing