diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SshTunnelRuntimeModule.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SshTunnelRuntimeModule.java
index 86d5434630ed..e2407ccc0f9d 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SshTunnelRuntimeModule.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SshTunnelRuntimeModule.java
@@ -1,36 +1,22 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.idea.svn.commandLine;
 
-import com.intellij.execution.CommandLineUtil;
 import com.intellij.execution.configurations.GeneralCommandLine;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.EnvironmentUtil;
-import com.intellij.util.ObjectUtils;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.execution.ParametersListUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.SvnConfiguration;
+import org.jetbrains.idea.svn.SvnConfiguration.SshConnectionType;
 import org.jetbrains.idea.svn.SvnConfigurationState;
 
-/**
- * @author Konstantin Kolosovsky.
- */
+import static com.intellij.execution.CommandLineUtil.toCommandLine;
+import static com.intellij.openapi.util.io.FileUtil.getNameWithoutExtension;
+import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName;
+import static com.intellij.openapi.util.text.StringUtil.*;
+import static com.intellij.util.ObjectUtils.notNull;
+import static com.intellij.util.containers.ContainerUtil.getFirstItem;
+
 public class SshTunnelRuntimeModule extends BaseCommandRuntimeModule {
 
   public static final String DEFAULT_SSH_TUNNEL_VALUE = "$SVN_SSH ssh -q";
@@ -41,10 +27,8 @@ public class SshTunnelRuntimeModule extends BaseCommandRuntimeModule {
 
   @Override
   public void onStart(@NotNull Command command) {
-    if (!CommandRuntime.isLocal(command)) {
-      if (!SvnConfiguration.SshConnectionType.SUBVERSION_CONFIG.equals(getState().sshConnectionType)) {
-        command.put("--config-option", "config:tunnels:ssh=" + StringUtil.notNullize(buildTunnelValue()));
-      }
+    if (!CommandRuntime.isLocal(command) && !SshConnectionType.SUBVERSION_CONFIG.equals(getState().sshConnectionType)) {
+      command.put("--config-option", "config:tunnels:ssh=" + buildTunnelValue());
     }
   }
 
@@ -58,19 +42,18 @@ public class SshTunnelRuntimeModule extends BaseCommandRuntimeModule {
     return getConfiguration().getState();
   }
 
-  @Nullable
+  @NotNull
   private String buildTunnelValue() {
     String sshPath = getState().sshExecutablePath;
-    sshPath = !StringUtil.isEmpty(sshPath) ? sshPath : getExecutablePath(getConfiguration().getSshTunnelSetting());
+    sshPath = !isEmpty(sshPath) ? sshPath : getExecutablePath(getConfiguration().getSshTunnelSetting());
 
-    return StringUtil
-      .join(CommandLineUtil.toCommandLine(sshPath, buildTunnelCommandLine(sshPath).getParametersList().getParameters()), " ");
+    return join(toCommandLine(sshPath, buildTunnelCommandLine(sshPath).getParametersList().getParameters()), " ");
   }
 
   @NotNull
   private GeneralCommandLine buildTunnelCommandLine(@NotNull String sshPath) {
     GeneralCommandLine result = new GeneralCommandLine(sshPath);
-    boolean isPuttyLinkClient = StringUtil.endsWithIgnoreCase(FileUtil.getNameWithoutExtension(sshPath), "plink");
+    boolean isPuttyLinkClient = endsWithIgnoreCase(getNameWithoutExtension(sshPath), "plink");
     SvnConfigurationState state = getState();
 
     // quiet mode
@@ -80,12 +63,12 @@ public class SshTunnelRuntimeModule extends BaseCommandRuntimeModule {
 
     result.addParameters(isPuttyLinkClient ? "-P" : "-p", String.valueOf(state.sshPort));
 
-    if (!StringUtil.isEmpty(state.sshUserName)) {
+    if (!isEmpty(state.sshUserName)) {
       result.addParameters("-l", state.sshUserName);
     }
 
-    if (SvnConfiguration.SshConnectionType.PRIVATE_KEY.equals(state.sshConnectionType) && !StringUtil.isEmpty(state.sshPrivateKeyPath)) {
-      result.addParameters("-i", FileUtil.toSystemIndependentName(state.sshPrivateKeyPath));
+    if (SshConnectionType.PRIVATE_KEY.equals(state.sshConnectionType) && !isEmpty(state.sshPrivateKeyPath)) {
+      result.addParameters("-i", toSystemIndependentName(state.sshPrivateKeyPath));
     }
 
     return result;
@@ -93,29 +76,23 @@ public class SshTunnelRuntimeModule extends BaseCommandRuntimeModule {
 
   @NotNull
   public static String getSshTunnelValue(@Nullable String tunnelSetting) {
-    tunnelSetting = !StringUtil.isEmpty(tunnelSetting) ? tunnelSetting : DEFAULT_SSH_TUNNEL_VALUE;
+    tunnelSetting = !isEmpty(tunnelSetting) ? tunnelSetting : DEFAULT_SSH_TUNNEL_VALUE;
     String svnSshVariableName = getSvnSshVariableName(tunnelSetting);
     String svnSshVariableValue = EnvironmentUtil.getValue(svnSshVariableName);
 
-    return !StringUtil.isEmpty(svnSshVariableValue)
+    return !isEmpty(svnSshVariableValue)
            ? svnSshVariableValue
-           : !StringUtil.isEmpty(svnSshVariableName) ? tunnelSetting.substring(1 + svnSshVariableName.length()) : tunnelSetting;
+           : !isEmpty(svnSshVariableName) ? tunnelSetting.substring(1 + svnSshVariableName.length()) : tunnelSetting;
   }
 
   @NotNull
   public static String getSvnSshVariableName(@Nullable String tunnel) {
-    String result = "";
-
-    if (tunnel != null && tunnel.startsWith("$")) {
-      result = ObjectUtils.notNull(StringUtil.substringBefore(tunnel, " "), tunnel).substring(1);
-    }
-
-    return result;
+    return tunnel != null && tunnel.startsWith("$") ? notNull(substringBefore(tunnel, " "), tunnel).substring(1) : "";
   }
 
   @NotNull
   public static String getExecutablePath(@Nullable String tunnelSetting) {
     // TODO: Add additional platform specific checks
-    return StringUtil.notNullize(ContainerUtil.getFirstItem(ParametersListUtil.parse(getSshTunnelValue(tunnelSetting)))).trim();
+    return notNullize(getFirstItem(ParametersListUtil.parse(getSshTunnelValue(tunnelSetting)))).trim();
   }
 }