 /**
 * Connects to object storage service and upon completion, invokes the completionHandler closure.
 */
-private func connectToObjectStorage(completionHandler: (objStore: ObjectStorage?) -> Void) {
-  // Create object store instance and connect
-  let objStore = ObjectStorage(projectId: objStorageConnProps.projectId)
-  objStore.connect(userId: objStorageConnProps.userId, password: objStorageConnProps.password, region: ObjectStorage.REGION_DALLAS) { (error) in
+private func connectToObjectStorage(completionHandler: (objStorage: ObjectStorage?) -> Void) {
+  // Create object storage instance and connect
+  let objStorage = ObjectStorage(projectId: objStorageConnProps.projectId)
+  objStorage.connect(userId: objStorageConnProps.userId, password: objStorageConnProps.password, region: ObjectStorage.REGION_DALLAS) { (error) in
     if let error = error {
       let errorMsg = "Could not connect to Object Storage."
       Log.error("\(errorMsg) Error was: '\(error)'.")
-      completionHandler(objStore: nil)
-    } else {
-      completionHandler(objStore: objStore)
-    }
-  }
-}
+      completionHandler(objStorage: nil)
+    } else {
+      completionHandler(objStorage: objStorage)
+    }
+  }
+}

  }

  // Get reference to container
  let retrieveContainer = { (objStore: ObjectStorage?) -> Void in
    if let objStore = objStore {
      objStore.retrieveContainer(name: containerName) { (error, container) in
        if let container = container where error == nil {
          storeImage(container)
        } else {

  }

  // Create container
  let createContainer = { (objStorage: ObjectStorage?) -> Void in
    if let objStorage = objStorage {
      objStorage.createContainer(name: name) { (error, container) in
        if let container = container where error == nil {
          configureContainer(container)
        } else {
