diff --git a/.gitignore b/.gitignore
index 7c64337..69e8420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ makefiles/
 config
 **/__pycache__
 *.pyc
+*.*~
diff --git a/make.py b/make.py
index a5c4f5b..be41100 100644
--- a/make.py
+++ b/make.py
@@ -8,9 +8,6 @@ import deploy
 # parse configuration
 config.parse()
 
-deploy.make()
-sys.exit(5)
-
 # update
 if ("1" == config.option("update")):
   base.git_update("core")
diff --git a/scripts/base.py b/scripts/base.py
index d4851a6..a62e6c1 100644
--- a/scripts/base.py
+++ b/scripts/base.py
@@ -131,7 +131,7 @@ def git_update(repo):
 # qmake -------------------------------------------------
 def qt_setup(platform):
   qt_dir = config.option("qt-dir") if (-1 == platform.find("_xp")) else config.option("qt-dir-xp")
-  qt_dir = (qt_dir + "/" + config.options["compiler"]) if is_platform_32 else (qt_dir + "/" + config.options["compiler_64"])
+  qt_dir = (qt_dir + "/" + config.options["compiler"]) if platform_is_32(platform) else (qt_dir + "/" + config.options["compiler_64"])
   set_env("QT_DEPLOY", qt_dir + "/bin")
   return qt_dir  
 
@@ -198,13 +198,14 @@ def qt_copy_plugin(name, out):
 
 # common ------------------------------------------------
 def is_windows():
-  if "windows" == base.host_platform():
+  if "windows" == host_platform():
     return True
   return False
 
 def platform_is_32(platform):
   if (-1 != platform.find("_32")):
     return True
+  return False
 
 # apps
 def app_make():
diff --git a/scripts/deploy.py b/scripts/deploy.py
index d402d5a..3855459 100644
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -12,7 +12,7 @@ def make_desktop():
     if not native_platform in config.platforms:
       continue
 
-    root_dir = base_dir + ("/" + native_platform + "/" + branding + ("/DesktopEditors" if is_windows else "/desktopeditors"))
+    root_dir = base_dir + ("/" + native_platform + "/" + branding + ("/DesktopEditors" if base.is_windows() else "/desktopeditors"))
     base.create_dir(root_dir)
 
     qt_dir = base.qt_setup(native_platform)
@@ -68,7 +68,7 @@ def make_desktop():
     base.copy_file(git_dir + "/desktop-apps/common/converter/DoctRenderer.config", root_dir + "/converter/DoctRenderer.config")
     base.copy_dir(git_dir + "/desktop-apps/common/converter/empty", root_dir + "/converter/empty")
 
-    if (!isWindowsXP) and (0 != platform.find("mac")) and (0 != platform.find("ios")):
+    if (False == isWindowsXP) and (0 != platform.find("mac")) and (0 != platform.find("ios")):
       base.copy_exe(core_dir + "/build/lib/" + platform, root_dir, "HtmlFileInternal")
 
     # dictionaries
@@ -99,35 +99,35 @@ def make_desktop():
       base.copy_dir(core_dir + "/build/lib/" + platform + "/ONLYOFFICE Helper.app", root_dir + "/ONLYOFFICE Helper.app")
 
     if isUseQt:
-      base.copy_qt_lib("Qt5Core", root_dir)
-      base.copy_qt_lib("Qt5Gui", root_dir)
-      base.copy_qt_lib("Qt5PrintSupport", root_dir)
-      base.copy_qt_lib("Qt5Svg", root_dir)
-      base.copy_qt_lib("Qt5Widgets", root_dir)
-      base.copy_qt_lib("Qt5Multimedia", root_dir)
-      base.copy_qt_lib("Qt5MultimediaWidgets", root_dir)
-      base.copy_qt_lib("Qt5Network", root_dir)
-      base.copy_qt_lib("Qt5OpenGL", root_dir)
+      base.qt_copy_lib("Qt5Core", root_dir)
+      base.qt_copy_lib("Qt5Gui", root_dir)
+      base.qt_copy_lib("Qt5PrintSupport", root_dir)
+      base.qt_copy_lib("Qt5Svg", root_dir)
+      base.qt_copy_lib("Qt5Widgets", root_dir)
+      base.qt_copy_lib("Qt5Multimedia", root_dir)
+      base.qt_copy_lib("Qt5MultimediaWidgets", root_dir)
+      base.qt_copy_lib("Qt5Network", root_dir)
+      base.qt_copy_lib("Qt5OpenGL", root_dir)
 
-      base.copy_qt_plugin("bearer", root_dir)
-      base.copy_qt_plugin("iconengines", root_dir)
-      base.copy_qt_plugin("imageformats", root_dir)
-      base.copy_qt_plugin("platforms", root_dir)
-      base.copy_qt_plugin("platforminputcontexts", root_dir)
-      base.copy_qt_plugin("printsupport", root_dir)
-      base.copy_qt_plugin("mediaservice", root_dir)
-      base.copy_qt_plugin("playlistformats", root_dir)
+      base.qt_copy_plugin("bearer", root_dir)
+      base.qt_copy_plugin("iconengines", root_dir)
+      base.qt_copy_plugin("imageformats", root_dir)
+      base.qt_copy_plugin("platforms", root_dir)
+      base.qt_copy_plugin("platforminputcontexts", root_dir)
+      base.qt_copy_plugin("printsupport", root_dir)
+      base.qt_copy_plugin("mediaservice", root_dir)
+      base.qt_copy_plugin("playlistformats", root_dir)
 
-      base.copy_qt_plugin("platformthemes", root_dir)
-      base.copy_qt_plugin("xcbglintegrations", root_dir)
+      base.qt_copy_plugin("platformthemes", root_dir)
+      base.qt_copy_plugin("xcbglintegrations", root_dir)
 
-      base.copy_qt_plugin("styles", root_dir)
+      base.qt_copy_plugin("styles", root_dir)
 
       if (0 == platform.find("linux")):
-        base.copy_qt_lib("Qt5DBus", root_dir)
-        base.copy_qt_lib("Qt5X11Extras", root_dir)
-        base.copy_qt_lib("Qt5XcbQpa", root_dir)
-        base.copy_qt_icu(root_dir)
+        base.qt_copy_lib("Qt5DBus", root_dir)
+        base.qt_copy_lib("Qt5X11Extras", root_dir)
+        base.qt_copy_lib("Qt5XcbQpa", root_dir)
+        base.qt_copy_icu(root_dir)
         base.copy_files(base.get_env("QT_DEPLOY") + "/../lib/libqgsttools_p.so*", root_dir)
 
       if (0 == platform.find("win")):