diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java
index a336a822f1..9d2bfe5a7c 100644
--- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java
+++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/ConverterUtils.java
@@ -44,13 +44,11 @@ private ConverterUtils() {
      * Returns the {@link RpcDefinition} from the given {@link EffectiveModelContext} and given {@link QName}.
      * The {@link QName} of a rpc can be constructed via
      *
-     * <p>
-     * {@code
+     * <p>{@code
      * QName.create("http://netconfcentral.org/ns/toaster", "2009-11-20", "make-toast");
      * } , where {@code "make-toast"} is the name of the RPC given in the yang model.
      *
-     * <p>
-     * If the given RPC was found in the {@link EffectiveModelContext} the {@link RpcDefinition} will be returned
+     * <p>If the given RPC was found in the {@link EffectiveModelContext} the {@link RpcDefinition} will be returned
      *
      * @param effectiveModelContext the effective model context used for the RPC resolution
      * @param rpcQName              {@link QName} of the RPC
@@ -175,8 +173,7 @@ public static XmlElement rpcAsOutput(final XmlElement inputXmlElement, final Str
     /**
      * Finds the {@link DataSchemaContext} for the given {@link QName} in {@link EffectiveModelContext}.
      *
-     * <p>
-     * Search is performed only on first level nodes of the modules, for recursive search,
+     * <p>Search is performed only on first level nodes of the modules, for recursive search,
      * the {@link YangInstanceIdentifier} is needed, thus consider using
      * {@link ConverterUtils#getSchemaNode(EffectiveModelContext, YangInstanceIdentifier)}.
      *
@@ -206,8 +203,7 @@ public static XmlElement rpcAsOutput(final XmlElement inputXmlElement, final Str
      * Finds the {@link DataSchemaContext} for the given namespace, revision and local name
      * in {@link EffectiveModelContext}.
      *
-     * <p>
-     * Search is performed only on first level nodes of the modules, for recursive search,
+     * <p>Search is performed only on first level nodes of the modules, for recursive search,
      * the {@link YangInstanceIdentifier} is needed, thus consider using
      * {@link ConverterUtils#getSchemaNode(EffectiveModelContext, YangInstanceIdentifier)}.
      *
diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java
index 3bd0325526..76cdda6014 100644
--- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java
+++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java
@@ -52,11 +52,9 @@ public class JsonNodeConverter implements NodeConverter {
      * This constructor will create an instance of {@link JsonNodeConverter} with the given
      * {@link EffectiveModelContext}.
      *
-     * <p>
-     * The effective model context will be used for proper RPC and Node resolution.
+     * <p>The effective model context will be used for proper RPC and Node resolution.
      *
-     * <p>
-     * The {@code JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02} will be used for JSON
+     * <p>The {@code JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02} will be used for JSON
      * serialization/deserialization of data.
      *
      * @param effectiveModelContext initial effective model context
@@ -69,11 +67,9 @@ public JsonNodeConverter(final EffectiveModelContext effectiveModelContext) {
      * This constructor will create an instance of {@link JsonNodeConverter} with the given
      * {@link EffectiveModelContext} and customizable {@link JSONCodecFactorySupplier}.
      *
-     * <p>
-     * The effective model context will be used for proper RPC and Node resolution.
+     * <p>The effective model context will be used for proper RPC and Node resolution.
      *
-     * <p>
-     * The {@code JSONCodecFactorySupplier} instance will be used for JSON serialization/deserialization of data.
+     * <p>The {@code JSONCodecFactorySupplier} instance will be used for JSON serialization/deserialization of data.
      *
      * @param effectiveModelContext initial effective model context
      * @param jsonCodecFactorySupplier JSON codec factory supplier
diff --git a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java
index 29c526cd8d..2b0a5acd9d 100644
--- a/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java
+++ b/lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/XmlNodeConverter.java
@@ -127,8 +127,7 @@ public Writer serializeRpc(final Inference inference, final NormalizedNode norma
     /**
      * Deserializes a given XML input data into {@link NormalizedNode}.
      *
-     * <p>
-     * In the case of deserializing multiple top level list entries, entries are expected to be wrapped in
+     * <p>In the case of deserializing multiple top level list entries, entries are expected to be wrapped in
      * {@code <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">}.
      *
      * @param inference {@link Inference} pointing to a node we are trying to deserialize
diff --git a/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java b/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java
index cd3d957432..1d58a6fe3b 100644
--- a/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java
+++ b/lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java
@@ -46,8 +46,7 @@
  * {@link LightyController} shutdown process. This configuration initializes all core lighty.io services as spring
  * beans.
  *
- * <p>
- * Example:
+ * <p>Example:
  * <pre>
  * &#64;Configuration
  * public class LightyConfiguration extends LightyCoreSprigConfiguration {
diff --git a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java
index ab1cb4721a..77eb1e984e 100644
--- a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java
+++ b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/AbstractLightyModule.java
@@ -30,8 +30,7 @@
  * {@link AbstractLightyModule#start()} and
  * {@link AbstractLightyModule#shutdown()} methods.
  *
- * <p>
- * <b>Example usage:</b>
+ * <p><b>Example usage:</b>
  * <pre>
  * <code>
  *     public class MyLightyModule extends AbstractLightyModule {
diff --git a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java
index b70953a53d..070c29b43a 100644
--- a/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java
+++ b/lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/util/FileToDatastoreUtils.java
@@ -83,11 +83,9 @@ public static void importConfigDataFile(final InputStream inputStream,
     /**
      * Writes/merges input stream containing serialized normalized node data into config datastore.
      *
-     * <p>
-     * Node is written at root node, that means only top level nodes are supported.
+     * <p>Node is written at root node, that means only top level nodes are supported.
      *
-     * <p>
-     * In the case of importing XML file, node needs to be wrapped in
+     * <p>In the case of importing XML file, node needs to be wrapped in
      * {@code <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">} element.
      *
      * @param inputStream           stream of serialized node to deserialize
diff --git a/lighty-core/lighty-parent/pom.xml b/lighty-core/lighty-parent/pom.xml
index d8aef6fb5f..482593249e 100644
--- a/lighty-core/lighty-parent/pom.xml
+++ b/lighty-core/lighty-parent/pom.xml
@@ -193,7 +193,7 @@
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
                             <!-- This should match the dependency management on com.puppycrawl.tools:checkstyle above -->
-                            <version>10.18.1</version>
+                            <version>10.18.2</version>
                         </dependency>
                         <dependency>
                             <groupId>com.github.sevntu-checkstyle</groupId>