diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/ProcessUtil.kt b/src/main/kotlin/com/beust/kobalt/app/remote/ProcessUtil.kt
index ff5b84ab..1c364533 100644
--- a/src/main/kotlin/com/beust/kobalt/app/remote/ProcessUtil.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/remote/ProcessUtil.kt
@@ -5,14 +5,8 @@ import java.net.Socket
 
 class ProcessUtil {
     companion object {
-        fun findAvailablePort(port: Int = 1234): Int {
-            if (isPortAvailable(port)) return port
-
-            for (i in 1235..65000) {
-                if (isPortAvailable(i)) return i
-            }
-            throw IllegalArgumentException("Couldn't find any port available, something is very wrong")
-        }
+        fun findAvailablePort(port: Int = 1234) = (port .. 65000).firstOrNull { isPortAvailable(it) }
+                ?: throw IllegalArgumentException("Couldn't find any port available, something is very wrong")
 
         private fun isPortAvailable(port: Int): Boolean {
             var s: Socket? = null