From 7963e2fc995fcbd37639b156613df457aed407fa Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sun, 14 Feb 2016 06:33:48 -0800
Subject: [PATCH] Refactor.

---
 src/main/kotlin/com/beust/kobalt/Main.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index 67a170df..764ede42 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -36,12 +36,14 @@ private fun parseArgs(argv: Array<String>): Main.RunInfo {
     return Main.RunInfo(result, args)
 }
 
-
-public fun mainNoExit(argv: Array<String>): Int {
+fun mainNoExit(argv: Array<String>): Int {
     val (jc, args) = parseArgs(argv)
     Kobalt.INJECTOR = Guice.createInjector(MainModule(args, KobaltSettings.readSettingsXml()))
-    val result = Kobalt.INJECTOR.getInstance(Main::class.java).run(jc, args, argv)
-    Kobalt.INJECTOR.getInstance(KobaltExecutors::class.java).shutdown()
+    val result = Kobalt.INJECTOR.getInstance(Main::class.java).run {
+        val runResult = run(jc, args, argv)
+        executors.shutdown()
+        runResult
+    }
     return result
 }