Code cleanup for csvimport.php