diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
index afd4143af..6ce11a390 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnection.java
@@ -284,6 +284,44 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		return new LettuceClusterServerCommands(this);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#ping()
+	 */
+	@Override
+	public String ping() {
+		Collection<String> ping = clusterCommandExecutor
+				.executeCommandOnAllNodes((LettuceClusterCommandCallback<String>) BaseRedisCommands::ping).resultsAsList();
+
+		for (String result : ping) {
+			if (!ObjectUtils.nullSafeEquals("PONG", result)) {
+				return "";
+			}
+		}
+
+		return "PONG";
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisClusterConnection#ping(org.springframework.data.redis.connection.RedisClusterNode)
+	 */
+	@Override
+	public String ping(RedisClusterNode node) {
+
+		return clusterCommandExecutor
+				.executeCommandOnSingleNode((LettuceClusterCommandCallback<String>) BaseRedisCommands::ping, node).getValue();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterNodes()
+	 */
+	@Override
+	public List<RedisClusterNode> clusterGetNodes() {
+		return new ArrayList<>(topologyProvider.getTopology().getNodes());
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterSlaves(org.springframework.data.redis.connection.RedisClusterNode)
@@ -301,6 +339,27 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				.getValue();
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetMasterSlaveMap()
+	 */
+	@Override
+	public Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterSlaveMap() {
+
+		List<NodeResult<Collection<RedisClusterNode>>> nodeResults = clusterCommandExecutor.executeCommandAsyncOnNodes(
+				(LettuceClusterCommandCallback<Collection<RedisClusterNode>>) client -> Converters
+						.toSetOfRedisClusterNodes(client.clusterSlaves(client.clusterMyId())),
+				topologyProvider.getTopology().getActiveMasterNodes()).getResults();
+
+		Map<RedisClusterNode, Collection<RedisClusterNode>> result = new LinkedHashMap<>();
+
+		for (NodeResult<Collection<RedisClusterNode>> nodeResult : nodeResults) {
+			result.put(nodeResult.getNode(), nodeResult.getValue());
+		}
+
+		return result;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterSlotForKey(byte[])
@@ -369,6 +428,20 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		clusterAddSlots(node, range.getSlotsArray());
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.redis.connection.RedisClusterCommands#countKeys(int)
+	 */
+	@Override
+	public Long clusterCountKeysInSlot(int slot) {
+
+		try {
+			return getConnection().clusterCountKeysInSlot(slot);
+		} catch (Exception ex) {
+			throw exceptionConverter.translate(ex);
+		}
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisClusterCommands#deleteSlots(org.springframework.data.redis.connection.RedisClusterNode, int[])
@@ -464,20 +537,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#countKeys(int)
-	 */
-	@Override
-	public Long clusterCountKeysInSlot(int slot) {
-
-		try {
-			return getConnection().clusterCountKeysInSlot(slot);
-		} catch (Exception ex) {
-			throw exceptionConverter.translate(ex);
-		}
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterReplicate(org.springframework.data.redis.connection.RedisClusterNode, org.springframework.data.redis.connection.RedisClusterNode)
@@ -490,35 +549,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 				(LettuceClusterCommandCallback<String>) client -> client.clusterReplicate(masterNode.getId()), replica);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#ping()
-	 */
-	@Override
-	public String ping() {
-		Collection<String> ping = clusterCommandExecutor
-				.executeCommandOnAllNodes((LettuceClusterCommandCallback<String>) BaseRedisCommands::ping).resultsAsList();
-
-		for (String result : ping) {
-			if (!ObjectUtils.nullSafeEquals("PONG", result)) {
-				return "";
-			}
-		}
-
-		return "PONG";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterConnection#ping(org.springframework.data.redis.connection.RedisClusterNode)
-	 */
-	@Override
-	public String ping(RedisClusterNode node) {
-
-		return clusterCommandExecutor
-				.executeCommandOnSingleNode((LettuceClusterCommandCallback<String>) BaseRedisCommands::ping, node).getValue();
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.RedisClusterConnection#keys(org.springframework.data.redis.connection.RedisClusterNode, byte[])
@@ -559,15 +589,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 
 	// --> cluster node stuff
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#getClusterNodes()
-	 */
-	@Override
-	public List<RedisClusterNode> clusterGetNodes() {
-		return new ArrayList<>(topologyProvider.getTopology().getNodes());
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.redis.connection.lettuce.LettuceConnection#watch(byte[][])
@@ -595,26 +616,6 @@ public class LettuceClusterConnection extends LettuceConnection implements Defau
 		throw new InvalidDataAccessApiUsageException("MULTI is currently not supported in cluster mode.");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.redis.connection.RedisClusterCommands#clusterGetMasterSlaveMap()
-	 */
-	@Override
-	public Map<RedisClusterNode, Collection<RedisClusterNode>> clusterGetMasterSlaveMap() {
-
-		List<NodeResult<Collection<RedisClusterNode>>> nodeResults = clusterCommandExecutor.executeCommandAsyncOnNodes(
-				(LettuceClusterCommandCallback<Collection<RedisClusterNode>>) client -> Converters
-						.toSetOfRedisClusterNodes(client.clusterSlaves(client.clusterMyId())),
-				topologyProvider.getTopology().getActiveMasterNodes()).getResults();
-
-		Map<RedisClusterNode, Collection<RedisClusterNode>> result = new LinkedHashMap<>();
-
-		for (NodeResult<Collection<RedisClusterNode>> nodeResult : nodeResults) {
-			result.put(nodeResult.getNode(), nodeResult.getValue());
-		}
-
-		return result;
-	}
 
 	public ClusterCommandExecutor getClusterCommandExecutor() {
 		return clusterCommandExecutor;