diff --git a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
index f110307..a9639ef 100644
--- a/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
+++ b/src/main/java/org/gcube/accounting/analytics/persistence/couchbase/AccountingPersistenceQueryCouchBase.java
@@ -326,15 +326,6 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		return String.format("%s%s", MAP_REDUCE__DESIGN, recordClass.newInstance().getRecordType());
 	}
 
-	/**
-	 * New division of designDocId and map-reduce
-	 * 
-	 * @param recordClass
-	 * @param keys
-	 * @return
-	 * @throws InstantiationException
-	 * @throws IllegalAccessException
-	 */
 	protected String getDesignDocIdSpecific(Class<? extends AggregatedRecord<?, ?>> recordClass,
 			Collection<String> keys) throws InstantiationException, IllegalAccessException {
 		String specific = "all";
@@ -346,12 +337,6 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		return getDesigndocIdSpecific;
 	}
 
-	/**
-	 * generate a name of map-reduce view
-	 * 
-	 * @param collection
-	 * @return
-	 */
 	public static String getMapReduceFunctionName(Collection<String> collection) {
 		String reduceFunction = MAP_REDUCE_ALL;
 		if (!collection.isEmpty()) {
@@ -367,12 +352,6 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		return reduceFunction;
 	}
 
-	/**
-	 * generate a name of map-reduce view
-	 * 
-	 * @param collection
-	 * @return
-	 */
 	public static String getMapReduceFunctionNameTopMap(String top, Collection<String> collection) {
 		logger.debug("top:{}", top);
 		logger.debug("collection:{}", collection.toString());
@@ -399,7 +378,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * EXPERIMENTAL DEPRECATED generate a name of design doc id for a top
 	 * 
 	 * @param collection
-	 * @return
+	 * @return String
 	 */
 	public static String getDesignDocIdName(Collection<String> collection) {
 		String reduceFunction = MAP_REDUCE_ALL;
@@ -688,17 +667,6 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 		return map;
 	}
 
-	/**
-	 * Used for calculate a top value
-	 * 
-	 * @param clz
-	 * @param temporalConstraint
-	 * @param filters
-	 * @param topKey
-	 * @param orderingProperty
-	 * @return
-	 * @throws Exception
-	 */
 	@Override
 	public SortedMap<NumberedFilter, SortedMap<Calendar, Info>> getTopValues(
 			Class<? extends AggregatedRecord<?, ?>> clz, TemporalConstraint temporalConstraint, List<Filter> filters,
@@ -747,7 +715,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * 
 	 * @param clz
 	 * @param topKey
-	 * @return
+	 * @return boolean
 	 * @throws Exception
 	 */
 	protected boolean usingNextPossibleValuesWithMap(Class<? extends AggregatedRecord<?, ?>> clz, String topKey,
@@ -836,7 +804,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * @param filters
 	 * @param key
 	 * @param orderingProperty
-	 * @return
+	 * @return SortedSet
 	 * @throws Exception
 	 */
 	public SortedSet<NumberedFilter> getNextPossibleValuesWithMap(Class<? extends AggregatedRecord<?, ?>> clz,
@@ -1007,7 +975,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * @param filters
 	 * @param key
 	 * @param orderingProperty
-	 * @return
+	 * @return SortedSet
 	 * @throws Exception
 	 */
 	@Override
@@ -1139,7 +1107,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * @param temporalConstraint
 	 * @param filters
 	 * @param contexts
-	 * @return
+	 * @return SortedMap
 	 * @throws Exception
 	 */
 	@Override
@@ -1194,7 +1162,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * @param temporalConstraint
 	 * @param filters
 	 * @param key
-	 * @return
+	 * @return SortedSet
 	 * @throws Exception
 	 */
 	@Override
@@ -1267,7 +1235,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * @param clz
 	 * @param temporalConstraint
 	 * @param applicant
-	 * @return
+	 * @return JSONObject
 	 * @throws Exception
 	 */
 	@Override
@@ -1375,7 +1343,7 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * Used for calculate a usage value for each element of list (QUOTA)
 	 * 
 	 * @param listUsage
-	 * @return
+	 * @return List
 	 * @throws Exception
 	 */
 	@Override
@@ -1610,11 +1578,10 @@ public class AccountingPersistenceQueryCouchBase implements AccountingPersistenc
 	 * @param clz
 	 * @param temporalConstraint
 	 * @param filters
-	 * @param context
-	 * @return
+	 * @param providersId
+	 * @return SortedMap
 	 * @throws JSONException
 	 */
-
 	public SortedMap<Filter, SortedMap<Calendar, Long>> getSpaceTimeSeries(Class<? extends AggregatedRecord<?, ?>> clz,
 			TemporalConstraint temporalConstraint, List<Filter> filters, List<String> providersId) throws Exception {