diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl
index 0be06c8..e244aa3 100755
--- a/utils/NewNightlyTest.pl
+++ b/utils/NewNightlyTest.pl
@@ -546,59 +546,41 @@
 # Create the source repository directory
 #
 ##############################################################
-if (!$NOCHECKOUT) {
-  if (-d $BuildDir) {
-    if (!$NOREMOVE) {
-      if ( $VERBOSE ) {
-        print "Build directory exists! Removing it\n";
+sub CheckoutSource {
+  if (!$NOCHECKOUT) {
+    if (-d $BuildDir) {
+      if (!$NOREMOVE) {
+        if ( $VERBOSE ) {
+          print "Build directory exists! Removing it\n";
+        }
+        system "rm -rf $BuildDir";
+        mkdir $BuildDir or die "Could not create checkout directory $BuildDir!";
+      } else {
+        if ( $VERBOSE ) {
+          print "Build directory exists!\n";
+        }
       }
-      system "rm -rf $BuildDir";
-      mkdir $BuildDir or die "Could not create checkout directory $BuildDir!";
     } else {
-      if ( $VERBOSE ) {
-        print "Build directory exists!\n";
-      }
+      mkdir $BuildDir or die "Could not create checkout directory $BuildDir!";
     }
-  } else {
-    mkdir $BuildDir or die "Could not create checkout directory $BuildDir!";
+
+    ChangeDir( $BuildDir, "checkout directory" );
+    my $SVNCMD = "$NICE svn co --non-interactive";
+    RunLoggedCommand("( time -p $SVNCMD $SVNURL/llvm/trunk llvm; cd llvm/projects ; " .
+                     "  $SVNCMD $TestSVNURL/test-suite/trunk llvm-test )", $COLog,
+                     "CHECKOUT LLVM");
+    if ($WITHCLANG) {
+        RunLoggedCommand("( cd llvm/tools ; " .
+                         "  $SVNCMD $SVNURL/cfe/trunk clang )", $COLog,
+                         "CHECKOUT CLANG");
+    }
   }
 }
-
-
-##############################################################
-#
-# Check out the llvm tree with SVN
-#
-##############################################################
-if (!$NOCHECKOUT) {
-  ChangeDir( $BuildDir, "checkout directory" );
-  my $SVNCMD = "$NICE svn co --non-interactive $SVNURL";
-  my $SVNCMD2 = "$NICE svn co --non-interactive $TestSVNURL";
-  RunLoggedCommand("( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .
-                   "$SVNCMD2/test-suite/trunk llvm-test )", $COLog,
-                   "CHECKOUT LLVM");
-  if ($WITHCLANG) {
-      my $SVNCMD = "$NICE svn co --non-interactive $SVNURL/cfe/trunk";
-      RunLoggedCommand("( time -p cd llvm/tools ; $SVNCMD clang )", $COLog,
-                       "CHECKOUT CLANG");
-  }
-}
+CheckoutSource();
 ChangeDir( $LLVMSrcDir , "llvm source directory") ;
 
 ##############################################################
 #
-# Get some static statistics about the current source code
-#
-# This can probably be put on the server side
-#
-##############################################################
-my $CheckoutTime_Wall = GetRegex "([0-9.]+)", `grep '^real' $COLog`;
-my $CheckoutTime_User = GetRegex "([0-9.]+)", `grep '^user' $COLog`;
-my $CheckoutTime_Sys = GetRegex "([0-9.]+)", `grep '^sys' $COLog`;
-my $CheckoutTime_CPU = $CVSCheckoutTime_User + $CVSCheckoutTime_Sys;
-
-##############################################################
-#
 # Build the entire tree, saving build messages to the build log
 #
 ##############################################################
@@ -651,7 +633,7 @@
 # Running dejagnu tests
 #
 ##############################################################
-my $DejangnuTestResults=""; # String containing the results of the dejagnu
+my $DejagnuTestResults=""; # String containing the results of the dejagnu
 my $dejagnu_output = "$DejagnuTestsLog";
 if (!$NODEJAGNU) {
   #Run the feature and regression tests, results are put into testrun.sum
@@ -813,11 +795,6 @@
                 "date: ".`date \"+20%y-%m-%d\"`.
                 "time: ".`date +\"%H:%M:%S\"`;
 
-my @CVS_DATA;
-my $cvs_data;
-@CVS_DATA = ReadFile "$COLog";
-$cvs_data = join("\n", @CVS_DATA);
-
 my @BUILD_DATA;
 my $build_data;
 @BUILD_DATA = ReadFile "$BuildLog";
@@ -867,6 +844,11 @@
 
 if ( $VERBOSE ) { print "SEND THE DATA VIA THE POST REQUEST\n"; }
 
+my $CheckoutTime_Wall = GetRegex "([0-9.]+)", `grep '^real' $COLog`;
+my $CheckoutTime_User = GetRegex "([0-9.]+)", `grep '^user' $COLog`;
+my $CheckoutTime_Sys = GetRegex "([0-9.]+)", `grep '^sys' $COLog`;
+my $CheckoutTime_CPU = $CVSCheckoutTime_User + $CVSCheckoutTime_Sys;
+
 my %hash_of_data = (
   'machine_data' => $machine_data,
   'build_data' => $build_data,