diff --git a/app/src/main/java/com/github/nullptroma/wallenc/app/tasks/TaskPipelineForegroundBootstrap.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/tasks/TaskPipelineForegroundBootstrap.kt
index 33a6780..1cd1d4d 100644
--- a/app/src/main/java/com/github/nullptroma/wallenc/app/tasks/TaskPipelineForegroundBootstrap.kt
+++ b/app/src/main/java/com/github/nullptroma/wallenc/app/tasks/TaskPipelineForegroundBootstrap.kt
@@ -18,7 +18,7 @@ import javax.inject.Singleton
 
 @Singleton
 class TaskPipelineForegroundBootstrap @Inject constructor(
-    @ApplicationContext private val app: Context,
+    @param:ApplicationContext private val app: Context,
     private val orchestrator: ITaskOrchestrator,
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_round.xml
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index a5918e6..44008a4 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/data/src/main/java/com/github/nullptroma/wallenc/data/storages/UnlockManager.kt b/data/src/main/java/com/github/nullptroma/wallenc/data/storages/UnlockManager.kt
index 6b665e0..b580179 100644
--- a/data/src/main/java/com/github/nullptroma/wallenc/data/storages/UnlockManager.kt
+++ b/data/src/main/java/com/github/nullptroma/wallenc/data/storages/UnlockManager.kt
@@ -2,8 +2,8 @@ package com.github.nullptroma.wallenc.data.storages
 
 import com.github.nullptroma.wallenc.data.db.app.repository.StorageKeyMapRepository
 import com.github.nullptroma.wallenc.data.model.StorageKeyMap
-import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
 import com.github.nullptroma.wallenc.data.storages.encrypt.EncryptedStorage
+import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
 import com.github.nullptroma.wallenc.domain.encrypt.Encryptor
 import com.github.nullptroma.wallenc.domain.interfaces.IStorage
 import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
@@ -12,7 +12,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
diff --git a/data/src/main/java/com/github/nullptroma/wallenc/data/storages/local/LocalStorageAccessor.kt b/data/src/main/java/com/github/nullptroma/wallenc/data/storages/local/LocalStorageAccessor.kt
index 8d7008f..49637ec 100644
--- a/data/src/main/java/com/github/nullptroma/wallenc/data/storages/local/LocalStorageAccessor.kt
+++ b/data/src/main/java/com/github/nullptroma/wallenc/data/storages/local/LocalStorageAccessor.kt
@@ -291,8 +291,8 @@ class LocalStorageAccessor(
             return@withContext listOf()
 
         val list = mutableListOf<IFile>()
-        scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = { _, CommonFile ->
-            list.add(CommonFile)
+        scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = { _, commonFile ->
+            list.add(commonFile)
         })
         return@withContext list
     }
@@ -303,7 +303,7 @@ class LocalStorageAccessor(
 
         val buf = mutableListOf<IFile>()
         var pageNumber = 0
-        scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = { _, CommonFile ->
+        scanStorage(baseStoragePath = path, maxDepth = 0, fileCallback = { _, commonFile ->
             if (buf.size == DATA_PAGE_LENGTH) {
                 val page = DataPage(
                     list = buf.toList(),
@@ -316,7 +316,7 @@ class LocalStorageAccessor(
                 emit(page)
                 buf.clear()
             }
-            buf.add(CommonFile)
+            buf.add(commonFile)
         })
         // отправка последней страницы
         val page = DataPage(
diff --git a/data/src/main/java/com/github/nullptroma/wallenc/data/utils/CloseHandledStream.kt b/data/src/main/java/com/github/nullptroma/wallenc/data/utils/CloseHandledStream.kt
index 52340bf..1ab123e 100644
--- a/data/src/main/java/com/github/nullptroma/wallenc/data/utils/CloseHandledStream.kt
+++ b/data/src/main/java/com/github/nullptroma/wallenc/data/utils/CloseHandledStream.kt
@@ -94,11 +94,11 @@ class CloseHandledStreamExtension {
         }
 
         fun OutputStream.onClosing(callback: ()->Unit): OutputStream {
-            return CloseHandledOutputStream(this, callback, {})
+            return CloseHandledOutputStream(this, callback) {}
         }
 
         fun InputStream.onClosing(callback: ()->Unit): InputStream {
-            return CloseHandledInputStream(this, callback, {})
+            return CloseHandledInputStream(this, callback) {}
         }
     }
 }
\ No newline at end of file
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index a5918e6..44008a4 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/local/vault/LocalVaultViewModel.kt b/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/local/vault/LocalVaultViewModel.kt
index a6ccc1c..679aecd 100644
--- a/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/local/vault/LocalVaultViewModel.kt
+++ b/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/local/vault/LocalVaultViewModel.kt
@@ -7,22 +7,20 @@ import com.github.nullptroma.wallenc.domain.interfaces.IDirectory
 import com.github.nullptroma.wallenc.domain.interfaces.IFile
 import com.github.nullptroma.wallenc.domain.interfaces.ILogger
 import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
+import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
+import com.github.nullptroma.wallenc.domain.tasks.TaskLogLevel
 import com.github.nullptroma.wallenc.domain.usecases.GetOpenedStoragesUseCase
 import com.github.nullptroma.wallenc.domain.usecases.ManageLocalVaultUseCase
 import com.github.nullptroma.wallenc.domain.usecases.ManageStoragesEncryptionUseCase
 import com.github.nullptroma.wallenc.domain.usecases.RemoveStorageUseCase
 import com.github.nullptroma.wallenc.domain.usecases.RenameStorageUseCase
 import com.github.nullptroma.wallenc.domain.usecases.StorageFileManagementUseCase
-import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
-import com.github.nullptroma.wallenc.domain.tasks.PipelineWork
-import com.github.nullptroma.wallenc.domain.tasks.TaskLogLevel
 import com.github.nullptroma.wallenc.presentation.ViewModelBase
 import com.github.nullptroma.wallenc.presentation.extensions.toPrintable
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.system.measureTimeMillis
@@ -116,7 +114,7 @@ class LocalVaultViewModel @Inject constructor(
         taskOrchestrator.enqueue(
             title = "Create storage",
             requiresForeground = false,
-            work = PipelineWork { ctx ->
+            work = { ctx ->
                 ctx.log(TaskLogLevel.Info, "Creating storage…")
                 manageLocalVaultUseCase.createStorage()
                 ctx.log(TaskLogLevel.Info, "Storage created")
@@ -195,7 +193,7 @@ class LocalVaultViewModel @Inject constructor(
         taskOrchestrator.enqueue(
             title = "Disable encryption",
             requiresForeground = true,
-            work = PipelineWork { ctx ->
+            work = { ctx ->
                 try {
                     ctx.log(TaskLogLevel.Info, "Disabling encryption…")
                     manageStoragesEncryptionUseCase.clearAndDisableEncryption(storage) { p ->
@@ -221,7 +219,7 @@ class LocalVaultViewModel @Inject constructor(
         taskOrchestrator.enqueue(
             title = "Remove storage",
             requiresForeground = true,
-            work = PipelineWork { ctx ->
+            work = { ctx ->
                 try {
                     ctx.log(TaskLogLevel.Info, "Removing storage…")
                     removeStorageUseCase.remove(storage)
diff --git a/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/tasks/TaskPipelineViewModel.kt b/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/tasks/TaskPipelineViewModel.kt
index be0a657..6f8f2d1 100644
--- a/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/tasks/TaskPipelineViewModel.kt
+++ b/presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/tasks/TaskPipelineViewModel.kt
@@ -18,7 +18,7 @@ class TaskPipelineViewModel @Inject constructor(
         orchestrator.enqueue(
             title = "Test task (${safeDurationSec}s)",
             requiresForeground = true,
-            work = PipelineWork { ctx ->
+            work = { ctx ->
                 val steps = if (safeDurationSec == 0) 1 else safeDurationSec * 10
                 ctx.log(TaskLogLevel.Info, "Test task started for ${safeDurationSec}s")
                 for (step in 0..steps) {