diff --git a/gradle.properties b/gradle.properties
index eed46a2..4859552 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 android.enableJetifier=true
 android.useAndroidX=true
 
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx4096m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/core/MviViewModel.kt b/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/core/MviViewModel.kt
index c02cd6e..8b4b170 100644
--- a/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/core/MviViewModel.kt
+++ b/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/core/MviViewModel.kt
@@ -48,6 +48,7 @@ abstract class MviViewModel<NavArgs : Parcelable, Action : ViewAction, State : V
 
     protected val navArgs: NavArgs = handle.get(MviFragment.INIT_ARGS_KEY) ?: throw IllegalStateException("Nav args mustn't be null")
 
+    @SuppressWarnings("detekt.VariableNaming")
     protected val _state = MutableLiveData(initialState)
     internal val state = Transformations.distinctUntilChanged(_state)
 
diff --git a/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/di/ViewModelFactory.kt b/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/di/ViewModelFactory.kt
index 5ae4d27..3e27dcf 100644
--- a/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/di/ViewModelFactory.kt
+++ b/mvi-arch/src/main/java/ru/touchin/roboswag/mvi_arch/di/ViewModelFactory.kt
@@ -13,7 +13,7 @@ class ViewModelFactory(
 ) : AbstractSavedStateViewModelFactory(owner, arguments) {
 
     @Suppress("UNCHECKED_CAST")
-    override fun <T : ViewModel?> create(key: String, modelClass: Class<T>, handle: SavedStateHandle): T {
-        return viewModelMap[modelClass]?.create(handle) as? T ?: throw IllegalStateException("Unknown ViewModel class")
-    }
+    override fun <T : ViewModel?> create(key: String, modelClass: Class<T>, handle: SavedStateHandle): T =
+            viewModelMap[modelClass]?.create(handle) as? T ?: throw IllegalStateException("Unknown ViewModel class")
+
 }
diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
index a511e7e..b7ac8e2 100644
--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/BaseStorable.java
@@ -430,7 +430,8 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
                     sourceBuilder.migration, sourceBuilder.defaultValue, sourceBuilder.storeScheduler, sourceBuilder.cacheTimeMillis);
         }
 
-        @SuppressWarnings({"PMD.ExcessiveParameterList", "CPD-START"})
+        @SuppressWarnings("PMD.ExcessiveParameterList")
+        //CPD-OFF
         //CPD: it is same code as constructor of Storable
         //ExcessiveParameterList: that's why we are using builder to create it
         private BuilderCore(@NonNull final TKey key,
@@ -455,7 +456,7 @@ public abstract class BaseStorable<TKey, TObject, TStoreObject, TReturnObject> {
             this.cacheTimeMillis = cacheTimeMillis;
         }
 
-        @SuppressWarnings("CPD-END")
+        //CPD-ON
         protected void setStoreSchedulerInternal(@Nullable final Scheduler storeScheduler) {
             this.storeScheduler = storeScheduler;
         }
diff --git a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
index bb6d465..2652105 100644
--- a/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
+++ b/storable/src/main/java/ru/touchin/roboswag/core/observables/storable/NonNullStorable.java
@@ -63,8 +63,8 @@ public class NonNullStorable<TKey, TObject, TStoreObject> extends BaseStorable<T
      * @param <TObject>      Type of actual object;
      * @param <TStoreObject> Type of store object. Could be same as {@link TObject}.
      */
-    @SuppressWarnings("CPD-START")
-    //CPD: it is same code as Builder of Storable because it's methods returning this and can't be inherited
+    // CPD-OFF
+    // CPD: it is same code as Builder of Storable because it's methods returning this and can't be inherited
     public static class Builder<TKey, TObject, TStoreObject> extends BuilderCore<TKey, TObject, TStoreObject> {
 
         public Builder(@NonNull final Storable.Builder<TKey, TObject, TStoreObject> sourceBuilder,
@@ -133,7 +133,8 @@ public class NonNullStorable<TKey, TObject, TStoreObject> extends BaseStorable<T
          * @return New {@link NonNullStorable}.
          */
         @NonNull
-        @SuppressWarnings("CPD-END")
+        // CPD-ON
+
         public NonNullStorable<TKey, TObject, TStoreObject> build() {
             if (getDefaultValue() == null) {
                 throw new ShouldNotHappenException();
diff --git a/views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt b/views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt
index 526f5a1..f8ec2b6 100644
--- a/views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt
+++ b/views/src/main/java/ru/touchin/roboswag/views/widget/AmountWithDecimalDecorator.kt
@@ -47,7 +47,7 @@ class AmountWithDecimalDecorator(
     fun getTextWithoutFormatting(decimalSeparatorToReplace: String = decimalSeparator): String =
             previousInputtedText.withoutFormatting(decimalSeparatorToReplace)
 
-    @Suppress("detekt.TooGenericExceptionCaught")
+    @Suppress("detekt.TooGenericExceptionCaught", "detekt.ComplexMethod", "detekt.LongMethod")
     private fun doOnTextChanged(text: String) {
         if (isTextWasArtificiallyChanged) {
             isTextWasArtificiallyChanged = false