diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/traceability/TraceabilityConsumer.java b/src/main/java/org/snomed/snowstorm/core/data/services/traceability/TraceabilityConsumer.java
index 151a51a26..960df666c 100644
--- a/src/main/java/org/snomed/snowstorm/core/data/services/traceability/TraceabilityConsumer.java
+++ b/src/main/java/org/snomed/snowstorm/core/data/services/traceability/TraceabilityConsumer.java
@@ -1,6 +1,8 @@
 package org.snomed.snowstorm.core.data.services.traceability;
 
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,13 +43,14 @@ public void accept(Activity activity) {
 	 */
 	void sendInBatches(Activity activity) {
 		int changeListSize = activity.getChanges().size();
-		logger.info("Number of changes (concept activities) is {} and is larger than max ({}).", changeListSize, maxConceptActiviesPerMessage );
-
-        for (List<Activity.ConceptActivity> conceptActivities : Iterables.partition(activity.getChanges(), maxConceptActiviesPerMessage)) {
-            Activity activityChunk = new Activity(activity.getUserId(), activity.getBranchPath(),
-                    activity.getCommitTimestamp(), activity.getSourceBranch(), activity.getActivityType());
-            activityChunk.setChanges(conceptActivities);
-            jmsTemplate.convertAndSend(jmsQueuePrefix + ".traceability", activityChunk);
-        }
+		List<List<Activity.ConceptActivity>> chunkedList = Lists.partition(activity.getChanges(), maxConceptActiviesPerMessage);
+		logger.info("Chunking {} concept activities into {} batches (of max size {})", changeListSize, chunkedList.size(), maxConceptActiviesPerMessage);
+
+		for (List<Activity.ConceptActivity> conceptActivities : chunkedList) {
+			Activity activityChunk = new Activity(activity.getUserId(), activity.getBranchPath(),
+					activity.getCommitTimestamp(), activity.getSourceBranch(), activity.getActivityType());
+			activityChunk.setChanges(conceptActivities);
+			jmsTemplate.convertAndSend(jmsQueuePrefix + ".traceability", activityChunk);
+		}
 	}
 }
\ No newline at end of file