diff --git a/src/main/java/it/pagopa/swclient/mil/bean/CommonHeader.java b/src/main/java/it/pagopa/swclient/mil/bean/CommonHeader.java
index d5052eb..d37ddcb 100644
--- a/src/main/java/it/pagopa/swclient/mil/bean/CommonHeader.java
+++ b/src/main/java/it/pagopa/swclient/mil/bean/CommonHeader.java
@@ -18,7 +18,9 @@
 import lombok.experimental.Accessors;
 
 /**
- * <p>Common header attributes</p>
+ * <p>
+ * Common header attributes.
+ * </p>
  * 
  * @author Antonio Tarricone
  */
@@ -30,49 +32,62 @@
 @Accessors(chain = true)
 @MerchantIdNotNullForPos(message = ErrorCode.MERCHANT_ID_MUST_NOT_BE_NULL_FOR_POS_MSG)
 public class CommonHeader {
-	/*
-	 * Request ID
+	/**
+	 * <p>
+	 * Request ID.
+	 * </p>
 	 */
 	@HeaderParam(HeaderParamName.REQUEST_ID)
 	@NotNull(message = ErrorCode.REQUEST_ID_MUST_NOT_BE_NULL_MSG)
 	// It's verified by it.pagopa.swclient.mil.CommonHeadersValidatorFilter:
-	// @Pattern(regexp = ValidationPattern.REQUEST_ID, message = ErrorCode.REQUEST_ID_MUST_MATCH_REGEXP_MSG)
+	// @Pattern(regexp = ValidationPattern.REQUEST_ID, message =
+	// ErrorCode.REQUEST_ID_MUST_MATCH_REGEXP_MSG)
 	private String requestId;
 
-	/*
-	 * Version of the required API
+	/**
+	 * <p>
+	 * Version of the required API.
+	 * </p>
 	 */
 	@HeaderParam(HeaderParamName.VERSION)
 	// It's verified by it.pagopa.swclient.mil.CommonHeadersValidatorFilter:
 	// @Pattern(regexp = ValidationPattern.VERSION, message = ErrorCode.VERSION_MUST_MATCH_REGEXP_MSG)
 	private String version;
 
-	/*
-	 * Acquirer ID assigned by PagoPA
+	/**
+	 * <p>
+	 * Acquirer ID assigned by PagoPA.
+	 * </p>
 	 */
 	@HeaderParam(HeaderParamName.ACQUIRER_ID)
 	@NotNull(message = ErrorCode.ACQUIRER_ID_MUST_NOT_BE_NULL_MSG)
 	@Pattern(regexp = ValidationPattern.ACQUIRER_ID, message = ErrorCode.ACQUIRER_ID_MUST_MATCH_REGEXP_MSG)
 	private String acquirerId;
 
-	/*
-	 * Channel originating the request
+	/**
+	 * <p>
+	 * Channel originating the request.
+	 * </p>
 	 */
 	@HeaderParam(HeaderParamName.CHANNEL)
 	@NotNull(message = ErrorCode.CHANNEL_MUST_NOT_BE_NULL_MSG)
 	@Pattern(regexp = ValidationPattern.CHANNEL)
 	private String channel;
 
-	/*
+	/**
+	 * <p>
 	 * Merchant ID originating the transaction. If Channel equals to POS, MerchantId must not be null.
+	 * </p>
 	 */
 	@HeaderParam(HeaderParamName.MERCHANT_ID)
 	@Pattern(regexp = ValidationPattern.MERCHANT_ID, message = ErrorCode.MERCHANT_ID_MUST_MATCH_REGEXP_MSG)
 	private String merchantId;
 
-	/*
+	/**
+	 * <p>
 	 * ID of the terminal originating the transaction. It must be unique per acquirer, channel and
 	 * merchant if present.
+	 * </p>
 	 */
 	@HeaderParam(HeaderParamName.TERMINAL_ID)
 	@NotNull(message = ErrorCode.TERMINAL_ID_MUST_NOT_BE_NULL_MSG)