--- a/src/jdk.packager/share/native/library/common/Platform.cpp	Fri Oct 12 19:00:51 2018 -0400
+++ b/src/jdk.packager/share/native/library/common/Platform.cpp	Wed Oct 17 13:50:11 2018 -0400
@@ -36,24 +36,22 @@
 StaticReadProperty<TString, &Environment::GetNewLine> Environment::NewLine;
 
 
-//--------------------------------------------------------------------------------------------------
+Platform& Platform::GetInstance() {
 
-Platform& Platform::GetInstance() {
-    //Lock lock(true);
 #ifdef WINDOWS
     static WindowsPlatform instance;
 #endif // WINDOWS
+
 #ifdef LINUX
     static LinuxPlatform instance;
 #endif // LINUX
+
 #ifdef MAC
     static MacPlatform instance;
 #endif // MAC
     return instance;
 }
 
-//--------------------------------------------------------------------------------------------------
-
 
 Library::Library() {
     Initialize();
@@ -86,7 +84,8 @@
 
 void Library::LoadDependencies() {
     if (FDependentLibraryNames != NULL && FDependenciesLibraries != NULL) {
-        for (std::vector<TString>::const_iterator iterator = FDependentLibraryNames->begin();
+        for (std::vector<TString>::const_iterator iterator =
+                FDependentLibraryNames->begin();
                 iterator != FDependentLibraryNames->end(); iterator++) {
             Library* library = new Library();
 
@@ -102,7 +101,8 @@
 
 void Library::UnloadDependencies() {
     if (FDependenciesLibraries != NULL) {
-        for (std::vector<Library*>::const_iterator iterator = FDependenciesLibraries->begin();
+        for (std::vector<Library*>::const_iterator iterator =
+                FDependenciesLibraries->begin();
                 iterator != FDependenciesLibraries->end(); iterator++) {
             Library* library = *iterator;
 
@@ -132,7 +132,8 @@
 
         if (FModule == NULL) {
             Messages& messages = Messages::GetInstance();
-            platform.ShowMessage(messages.GetMessage(LIBRARY_NOT_FOUND), FileName);
+            platform.ShowMessage(messages.GetMessage(LIBRARY_NOT_FOUND),
+                    FileName);
             result = false;
         } else {
             fname = PlatformString(FileName).toStdString();
@@ -169,7 +170,8 @@
         InitializeDependencies();
 
         if (FDependentLibraryNames != NULL) {
-            for (std::vector<TString>::const_iterator iterator = FDependentLibraryNames->begin();
+            for (std::vector<TString>::const_iterator iterator =
+                    FDependentLibraryNames->begin();
                 iterator != FDependentLibraryNames->end(); iterator++) {
                 TString fileName = *iterator;
                 AddDependency(fileName);
@@ -177,4 +179,3 @@
         }
     }
 }
-//--------------------------------------------------------------------------------------------------