diff --git a/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
index a8d60dc..2d2811d 100644
--- a/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/UsageRecord.java
@@ -18,8 +18,7 @@ public interface UsageRecord extends Record {
 	
 	/**
 	 * KEY for : The Operation Result of the accounted operation.
-	 * The value is expressed as 
-	 * {@link #org.gcube.accounting.datamodel.UsageRecord.OperationResult}
+	 * The value is expressed as OperationResult
 	 */
 	public static final String OPERATION_RESULT = "operationResult";
 	
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java
index a0b6e87..ad17986 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageStatusRecord.java
@@ -41,8 +41,7 @@ public abstract class AbstractStorageStatusRecord extends BasicUsageRecord {
 	
 	/**
 	 *  KEY for : type of data accessed. 
-	 *  The value is a controlled dictionary by 
-	 * {@link #StorageStatusRecord.DataType}
+	 *  The value is a controlled dictionary by StorageStatusRecord.DataType
 	 */
 	@RequiredField @ValidDataTypeVolume
 	public static final String DATA_TYPE = "dataType";
diff --git a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
index 27c1b59..f3223bd 100644
--- a/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
+++ b/src/main/java/org/gcube/accounting/datamodel/basetypes/AbstractStorageUsageRecord.java
@@ -60,15 +60,13 @@ public abstract class AbstractStorageUsageRecord extends BasicUsageRecord {
 	
 	/**
 	 * KEY for : The operation performed over the stored resource.
-	 * The value is a controlled dictionary by 
-	 * {@link #StorageUsageRecord.OperationType}
+	 * The value is a controlled dictionary by StorageUsageRecord.OperationType
 	 */
 	@RequiredField @ValidOperationType @FixDataVolumeSign
 	public static final String OPERATION_TYPE = "operationType";
 	/**
 	 *  KEY for : type of data accessed. 
-	 *  The value is a controlled dictionary by 
-	 * {@link #StorageUsageRecord.DataType}
+	 *  The value is a controlled dictionary by StorageUsageRecord.DataType
 	 */
 	@RequiredField @ValidDataType
 	public static final String DATA_TYPE = "dataType";
diff --git a/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java b/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java
index 11c5c19..c79696a 100644
--- a/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java
+++ b/src/main/java/org/gcube/accounting/persistence/AccountingPersistence.java
@@ -26,12 +26,12 @@ public class AccountingPersistence {
 	}
 	
 	/**
-	 * Persist the {@link #UsageRecord}.
+	 * Persist the UsageRecord.
 	 * The Record is validated first, then accounted, in a separated thread. 
 	 * So that the program can continue the execution.
 	 * If the persistence fails the class write that the record in a local file
-	 * so that the {@link #UsageRecord} can be recorder later.
-	 * @param record the {@link #UsageRecord} to persist
+	 * so that the UsageRecord can be recorder later.
+	 * @param record the UsageRecord to persist
 	 * @throws InvalidValueException 
 	 */
 	public void account(final Record record) throws InvalidValueException {