diff --git a/CleanStore/Scenes/CreateOrder/CreateOrderConfigurator.swift b/CleanStore/Scenes/CreateOrder/CreateOrderConfigurator.swift
index fa0370f..0a9a584 100644
--- a/CleanStore/Scenes/CreateOrder/CreateOrderConfigurator.swift
+++ b/CleanStore/Scenes/CreateOrder/CreateOrderConfigurator.swift
@@ -33,19 +33,7 @@ class CreateOrderConfigurator
 {
   // MARK: Object lifecycle
   
-  class var sharedInstance: CreateOrderConfigurator
-  {
-    struct Static {
-      static var instance: CreateOrderConfigurator?
-      static var token: dispatch_once_t = 0
-    }
-    
-    dispatch_once(&Static.token) {
-      Static.instance = CreateOrderConfigurator()
-    }
-    
-    return Static.instance!
-  }
+  class let sharedInstance = CreateOrderConfigurator()
   
   // MARK: Configuration
   
diff --git a/CleanStore/Scenes/ListOrders/ListOrdersConfigurator.swift b/CleanStore/Scenes/ListOrders/ListOrdersConfigurator.swift
index fb3e3cd..15e461d 100644
--- a/CleanStore/Scenes/ListOrders/ListOrdersConfigurator.swift
+++ b/CleanStore/Scenes/ListOrders/ListOrdersConfigurator.swift
@@ -33,19 +33,7 @@ class ListOrdersConfigurator
 {
   // MARK: Object lifecycle
   
-  class var sharedInstance: ListOrdersConfigurator
-  {
-    struct Static {
-      static var instance: ListOrdersConfigurator?
-      static var token: dispatch_once_t = 0
-    }
-    
-    dispatch_once(&Static.token) {
-      Static.instance = ListOrdersConfigurator()
-    }
-    
-    return Static.instance!
-  }
+  class let sharedInstance = ListOrdersConfigurator()
   
   // MARK: Configuration
   
diff --git a/CleanStore/Scenes/ShowOrder/ShowOrderConfigurator.swift b/CleanStore/Scenes/ShowOrder/ShowOrderConfigurator.swift
index cff989f..211c45c 100644
--- a/CleanStore/Scenes/ShowOrder/ShowOrderConfigurator.swift
+++ b/CleanStore/Scenes/ShowOrder/ShowOrderConfigurator.swift
@@ -33,19 +33,7 @@ class ShowOrderConfigurator
 {
   // MARK: Object lifecycle
   
-  class var sharedInstance: ShowOrderConfigurator
-  {
-    struct Static {
-      static var instance: ShowOrderConfigurator?
-      static var token: dispatch_once_t = 0
-    }
-    
-    dispatch_once(&Static.token) {
-      Static.instance = ShowOrderConfigurator()
-    }
-    
-    return Static.instance!
-  }
+  class let sharedInstance = ShowOrderConfigurator()
   
   // MARK: Configuration