diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 68bdc49272b..16e6ec5f6b3 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -6,24 +6,24 @@
     <property name="jdk16.home" value="${java.home}"/>
     <property name="fail.on.plugin.verifier.error" value="true"/>
 
-    <property name="version_substitute_dir" value="${basedir}/versions_temp/" />
+    <property name="version_substitute_dir" value="${basedir}/versions_temp/"/>
 
     <property name="artifact.output.path" value="${basedir}/out/artifacts"/>
     <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
     <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
-    <property name="plugin.xml.versioned" value="${plugin.xml}.versioned" />
+    <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
 
     <property name="android-extensions.plugin.xml" value="plugins/android-idea-plugin/src/META-INF/plugin.xml"/>
     <property name="android-extensions.plugin.xml.bk" value="${version_substitute_dir}/kotlin-android-extensions.plugin.xml.bk"/>
-    <property name="android-extensions.plugin.xml.versioned" value="${android-extensions.plugin.xml}.versioned" />
+    <property name="android-extensions.plugin.xml.versioned" value="${android-extensions.plugin.xml}.versioned"/>
 
     <property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java"/>
     <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinVersion.java.bk"/>
-    <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned" />
+    <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
 
-    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip" />
-    <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip" />
-    <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip" />
+    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
+    <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip"/>
+    <property name="android-extensions.zip" value="${artifact.output.path}/kotlin-android-extensions-plugin-${build.number}.zip"/>
 
     <macrodef name="echoprop">
         <attribute name="prop"/>
@@ -47,68 +47,68 @@
     </target>
 
     <macrodef name="substituteVersionInFile">
-      <attribute name="target.file"/>
-      <attribute name="test.string"/>
-      <attribute name="target.file.bk" default="@{target.file}.bk"/>
-      <attribute name="target.file.versioned" default="@{target.file}.versioned"/>
-      <attribute name="token.key" default="snapshot"/>
-      <attribute name="version" default="${build.number}"/>
-      <sequential>
-        <!-- Create backup. Backup will be restored after build end. This will allow to rebuild project without renew
-             plugin.xml from repository. -->
-        <copy file="@{target.file}" tofile="@{target.file.bk}"/>
+        <attribute name="target.file"/>
+        <attribute name="test.string"/>
+        <attribute name="target.file.bk" default="@{target.file}.bk"/>
+        <attribute name="target.file.versioned" default="@{target.file}.versioned"/>
+        <attribute name="token.key" default="snapshot"/>
+        <attribute name="version" default="${build.number}"/>
+        <sequential>
+            <!-- Create backup. Backup will be restored after build end. This will allow to rebuild project without renew
+                 plugin.xml from repository. -->
+            <copy file="@{target.file}" tofile="@{target.file.bk}"/>
 
-        <!-- Check that version has correct pattern for substitution -->
-        <copy todir="">
-            <fileset file="@{target.file.bk}">
-                <contains text="@{test.string}"/>
-            </fileset>
-            <filterchain>
-                <replacetokens>
-                    <token key="@{token.key}" value="@{version}"/>
-                </replacetokens>
-            </filterchain>
-            <mergemapper to="@{target.file.versioned}"/>
-        </copy>
+            <!-- Check that version has correct pattern for substitution -->
+            <copy todir="">
+                <fileset file="@{target.file.bk}">
+                    <contains text="@{test.string}"/>
+                </fileset>
+                <filterchain>
+                    <replacetokens>
+                        <token key="@{token.key}" value="@{version}"/>
+                    </replacetokens>
+                </filterchain>
+                <mergemapper to="@{target.file.versioned}"/>
+            </copy>
 
-        <!-- If file doesn't exist - there's a problem with original plugin.xml. Probably there's a bad pattern used for version -->
-        <copy file="@{target.file.versioned}" tofile="@{target.file}" overwrite="true"/>
+            <!-- If file doesn't exist - there's a problem with original plugin.xml. Probably there's a bad pattern used for version -->
+            <copy file="@{target.file.versioned}" tofile="@{target.file}" overwrite="true"/>
 
-        <delete file="@{target.file.versioned}" quiet="true"/>
-      </sequential>
+            <delete file="@{target.file.versioned}" quiet="true"/>
+        </sequential>
     </macrodef>
 
     <target name="writeVersionToTemplateFiles">
-      <mkdir dir="${version_substitute_dir}"/>
+        <mkdir dir="${version_substitute_dir}"/>
 
-      <substituteVersionInFile
-          target.file="${plugin.xml}"
-          target.file.bk="${plugin.xml.bk}"
-          target.file.versioned="${plugin.xml.versioned}"
-          test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
+        <substituteVersionInFile
+                target.file="${plugin.xml}"
+                target.file.bk="${plugin.xml.bk}"
+                target.file.versioned="${plugin.xml.versioned}"
+                test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
 
-      <substituteVersionInFile
-          target.file="${android-extensions.plugin.xml}"
-          target.file.bk="${android-extensions.plugin.xml.bk}"
-          target.file.versioned="${android-extensions.plugin.xml.versioned}"
-          test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
+        <substituteVersionInFile
+                target.file="${android-extensions.plugin.xml}"
+                target.file.bk="${android-extensions.plugin.xml.bk}"
+                target.file.versioned="${android-extensions.plugin.xml.versioned}"
+                test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
 
-      <substituteVersionInFile
-          target.file="${compiler.version.java}"
-          target.file.bk="${compiler.version.java.bk}"
-          target.file.versioned="${compiler.version.java.versioned}"
-          test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
+        <substituteVersionInFile
+                target.file="${compiler.version.java}"
+                target.file.bk="${compiler.version.java.bk}"
+                target.file.versioned="${compiler.version.java.versioned}"
+                test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
 
-      <replicateIdeaVersion target.file="${android-extensions.plugin.xml}" />
+        <replicateIdeaVersion target.file="${android-extensions.plugin.xml}"/>
     </target>
 
-  <target name="revertTemplateFiles">
-      <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
-      <copy file="${android-extensions.plugin.xml.bk}" tofile="${android-extensions.plugin.xml}" overwrite="true"/>
-      <copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/>
+    <target name="revertTemplateFiles">
+        <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
+        <copy file="${android-extensions.plugin.xml.bk}" tofile="${android-extensions.plugin.xml}" overwrite="true"/>
+        <copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/>
 
-      <delete dir="${version_substitute_dir}" quiet="true"/>
-  </target>
+        <delete dir="${version_substitute_dir}" quiet="true"/>
+    </target>
 
     <target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts"/>
 
@@ -120,8 +120,10 @@
             <sequential>
                 <zip destfile="@{filename}">
                     <zipfileset prefix="@{dir}" dir="${artifact.output.path}/@{dir}" excludes="kotlinc/bin/*"/>
-                    <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" includes="*.bat" filemode="644"/>
-                    <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" excludes="*.bat" filemode="755"/>
+                    <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" includes="*.bat"
+                                filemode="644"/>
+                    <zipfileset prefix="@{dir}/kotlinc/bin" dir="${artifact.output.path}/@{dir}/kotlinc/bin" excludes="*.bat"
+                                filemode="755"/>
                 </zip>
                 <delete dir="${artifact.output.path}/@{dir}" quiet="true"/>
             </sequential>
@@ -131,7 +133,7 @@
         <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
 
         <zip destfile="${android-extensions.zip}">
-            <zipfileset prefix="KotlinAndroidExtensions" dir="${artifact.output.path}/KotlinAndroidExtensions" />
+            <zipfileset prefix="KotlinAndroidExtensions" dir="${artifact.output.path}/KotlinAndroidExtensions"/>
         </zip>
         <delete dir="${artifact.output.path}/KotlinAndroidExtensions" quiet="true"/>
     </target>
@@ -150,7 +152,7 @@
         <attribute name="file-name"/>
 
         <sequential>
-            <local name="file.size" />
+            <local name="file.size"/>
             <length file="@{path}/@{file-name}" property="file.size"/>
             <print-statistic key="@{file-name} size" value="${file.size}"/>
         </sequential>