diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/aspects/LogAspect.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/aspects/LogAspect.kt
index 3395520..b9f1397 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/aspects/LogAspect.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/aspects/LogAspect.kt
@@ -25,7 +25,7 @@ class LogAspect(
     fun logInvocation(pjp: ProceedingJoinPoint, autoLoggingAnnotation: AutoLogging): Any? {
         val duration = LogDuration()
 
-        val actionResult = runCatching { pjp.proceed() }
+        val actionResult = runCatching(pjp::proceed)
 
         try {
             val method = pjp.method()
@@ -85,7 +85,8 @@ class LogAspect(
             return emptyList()
         }
 
-        val returnValue = result.getOrNull() ?: return emptyList()
+        val returnValue = result.getOrNull()
+            ?: return emptyList()
 
         return logValueFieldSerializer.invoke(
             LogValueField (
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/LogValueFieldSerializerImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/LogValueFieldSerializerImpl.kt
index 302a144..05cf8b1 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/LogValueFieldSerializerImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/LogValueFieldSerializerImpl.kt
@@ -62,7 +62,7 @@ class LogValueFieldSerializerImpl(
     }
 
     override operator fun invoke(field: LogValueField): List<LogDataItem> {
-        return expand(field).mapNotNull(::serialize)
+        return expand(field).mapNotNull(this::serialize)
     }
 
     companion object {
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/BooleanLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/BooleanLogValueResolverImpl.kt
index 2ac6509..5b6e66e 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/BooleanLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/BooleanLogValueResolverImpl.kt
@@ -11,14 +11,14 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
 class BooleanLogValueResolverImpl : LogValueResolver<Boolean> {
 
     override operator fun invoke(value: Any): ResolvedValue<Boolean>? {
-        if (value is Boolean) {
-            return ResolvedValue(
-                value = value,
-                typeName = "boolean"
-            )
+        if (value !is Boolean) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value,
+            typeName = "boolean"
+        )
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/DateLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/DateLogValueResolverImpl.kt
index e0b1830..2a98caf 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/DateLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/DateLogValueResolverImpl.kt
@@ -12,14 +12,14 @@ import java.time.temporal.Temporal
 class DateLogValueResolverImpl : LogValueResolver<String> {
 
     override fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is Temporal) {
-            return ResolvedValue(
-                value = value.toString(),
-                typeName = "date",
-            )
+        if (value !is Temporal) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value.toString(),
+            typeName = "date",
+        )
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FileLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FileLogValueResolverImpl.kt
index ed94b37..0d654f7 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FileLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FileLogValueResolverImpl.kt
@@ -12,13 +12,13 @@ import java.io.File
 class FileLogValueResolverImpl : LogValueResolver<String> {
 
     override operator fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is File) {
-            return ResolvedValue(
-                value = value.toString(),
-            )
+        if (value !is File) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value.toString(),
+        )
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FunctionLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FunctionLogValueResolverImpl.kt
index 534c090..6ceeb37 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FunctionLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/FunctionLogValueResolverImpl.kt
@@ -11,11 +11,11 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
 class FunctionLogValueResolverImpl : LogValueResolver<String> {
 
     override operator fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is Function<*>) {
-            return ResolvedValue.SKIP_VALUE
+        if (value !is Function<*>) {
+            return null
         }
 
-        return null
+        return ResolvedValue.SKIP_VALUE
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/NumberLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/NumberLogValueResolverImpl.kt
index eca1c7b..cd697ca 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/NumberLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/NumberLogValueResolverImpl.kt
@@ -11,14 +11,14 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
 class NumberLogValueResolverImpl : LogValueResolver<Number> {
 
     override operator fun invoke(value: Any): ResolvedValue<Number>? {
-        if (value is Number) {
-            return ResolvedValue(
-                value = value,
-                typeName = "number"
-            )
+        if (value !is Number) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value,
+            typeName = "number"
+        )
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/StringLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/StringLogValueResolverImpl.kt
index 78bea37..e569a5f 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/StringLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/StringLogValueResolverImpl.kt
@@ -11,12 +11,12 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
 class StringLogValueResolverImpl : LogValueResolver<String> {
 
     override fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is String) {
-            return ResolvedValue(
-                value = value
-            )
+        if (value !is String) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value
+        )
     }
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UUIDLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UUIDLogValueResolverImpl.kt
index 0c5d8fb..b0ce839 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UUIDLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UUIDLogValueResolverImpl.kt
@@ -12,13 +12,13 @@ import java.util.*
 class UUIDLogValueResolverImpl : LogValueResolver<String> {
 
     override operator fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is UUID) {
-            return ResolvedValue(
-                value = value.toString(),
-            )
+        if (value !is UUID) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value.toString(),
+        )
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UnitLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UnitLogValueResolverImpl.kt
index e7d5247..e990e8d 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UnitLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UnitLogValueResolverImpl.kt
@@ -11,11 +11,11 @@ import ru.touchin.logger.spring.serializers.resolvers.dto.ResolvedValue
 class UnitLogValueResolverImpl : LogValueResolver<String> {
 
     override operator fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is Unit) {
-            return ResolvedValue.SKIP_VALUE
+        if (value !is Unit) {
+            return null
         }
 
-        return null
+        return ResolvedValue.SKIP_VALUE
     }
 
 }
diff --git a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UrlLogValueResolverImpl.kt b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UrlLogValueResolverImpl.kt
index 58fedb1..8e66c5e 100644
--- a/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UrlLogValueResolverImpl.kt
+++ b/logger-spring/src/main/kotlin/ru/touchin/logger/spring/serializers/resolvers/UrlLogValueResolverImpl.kt
@@ -13,13 +13,13 @@ import java.net.URL
 class UrlLogValueResolverImpl : LogValueResolver<String> {
 
     override operator fun invoke(value: Any): ResolvedValue<String>? {
-        if (value is URL || value is URI) {
-            return ResolvedValue(
-                value = value.toString(),
-            )
+        if (value !is URL && value !is URI) {
+            return null
         }
 
-        return null
+        return ResolvedValue(
+            value = value.toString(),
+        )
     }
 
 }