diff --git a/Framework/DataHandling/test/DownloadInstrumentTest.h b/Framework/DataHandling/test/DownloadInstrumentTest.h
index be5a431b9a3e53d1b70c8a7c45f3e6c47f8206f0..fc3112452b60b4dd0d2f3322c5b6327ea7c807e1 100644
--- a/Framework/DataHandling/test/DownloadInstrumentTest.h
+++ b/Framework/DataHandling/test/DownloadInstrumentTest.h
@@ -100,19 +100,15 @@ public:
   }
   static void destroySuite(DownloadInstrumentTest *suite) { delete suite; }
 
-  void createDirectory(Poco::Path path)
-  {
+  void createDirectory(Poco::Path path) {
     Poco::File file(path);
-    if (file.createDirectory())
-    {
+    if (file.createDirectory()) {
       m_directoriesToRemove.push_back(file);
     }
   }
 
-  void removeDirectories()
-  {
-    for (auto directory : m_directoriesToRemove)
-    {
+  void removeDirectories() {
+    for (auto directory : m_directoriesToRemove) {
       try {
         directory.remove(true);
       } catch (Poco::FileException &fe) {
@@ -125,7 +121,7 @@ public:
   void setUp() override {
     const std::string TEST_SUFFIX = "TEMPORARY_unitTest";
     m_originalInstDir =
-      Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories();
+        Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories();
 
     // change the local download directory by adding a unittest subdirectory
     auto testDirectories = m_originalInstDir;
@@ -143,17 +139,20 @@ public:
       createDirectory(installInstrumentPath);
       testDirectories.back() = installInstrumentPath.toString();
     } catch (Poco::FileException &) {
-      std::cout << "Failed to change instrument directory continuing without, fine, just slower\n";
+      std::cout << "Failed to change instrument directory continuing without, "
+                   "fine, just slower\n";
     }
 
-    Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(testDirectories);
+    Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(
+        testDirectories);
 
     auto test =
-      Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories();
+        Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories();
   }
 
   void tearDown() override {
-    Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(m_originalInstDir);
+    Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(
+        m_originalInstDir);
     removeDirectories();
   }
 
@@ -163,7 +162,7 @@ public:
     TS_ASSERT(alg.isInitialized())
   }
 
-  // These tests create some files, but they entire directories are created and 
+  // These tests create some files, but they entire directories are created and
   // removed in setup and teardown
   void test_exec() {
     TSM_ASSERT_EQUALS("The expected number of files downloaded was wrong.",
@@ -179,14 +178,13 @@ public:
     std::ofstream file;
     file.open(orphanedFilePath.toString().c_str());
     file.close();
-    
+
     TSM_ASSERT_EQUALS("The expected number of files downloaded was wrong.",
                       runDownloadInstrument(), 2);
 
     Poco::File orphanedFile(orphanedFilePath);
     TSM_ASSERT("The orphaned file was not deleted",
                orphanedFile.exists() == false);
-
   }
 
   int runDownloadInstrument() {
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 4300b961294caf48df3e75574ffeaa4fbf3b064b..099cdaf525aca09fa98d3b3b889c0e454eaeb0d8 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -208,7 +208,7 @@ public:
   /// Get the list of user search paths
   const std::vector<std::string> &getUserSearchDirs() const;
   /// Sets instrument directories
-  void setInstrumentDirectories(const std::vector<std::string>& directories);
+  void setInstrumentDirectories(const std::vector<std::string> &directories);
   /// Get instrument search directory
   const std::vector<std::string> &getInstrumentDirectories() const;
   /// Get instrument search directory
diff --git a/Framework/Kernel/test/ConfigServiceTest.h b/Framework/Kernel/test/ConfigServiceTest.h
index d0ce6e7a9d555baedbabd947d11b35c218fc5fa7..bd2f247a1d1eff08e9611e0b2da34383334f0d39 100644
--- a/Framework/Kernel/test/ConfigServiceTest.h
+++ b/Framework/Kernel/test/ConfigServiceTest.h
@@ -360,11 +360,12 @@ public:
 
   void TestSetInstrumentDirectory() {
 
-    auto originalDirectories = ConfigService::Instance().getInstrumentDirectories();
+    auto originalDirectories =
+        ConfigService::Instance().getInstrumentDirectories();
     std::vector<std::string> testDirectories;
     testDirectories.push_back("Test Directory 1");
     testDirectories.push_back("Test Directory 2");
-    ConfigService::Instance().setInstrumentDirectories(testDirectories); 
+    ConfigService::Instance().setInstrumentDirectories(testDirectories);
     auto readDirectories = ConfigService::Instance().getInstrumentDirectories();
     TS_ASSERT_EQUALS(readDirectories.size(), testDirectories.size());
     TS_ASSERT_EQUALS(readDirectories[0], testDirectories[0]);