diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
index 2ded2053588..7ba0076a216 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
@@ -36,7 +36,7 @@ import org.springframework.web.reactive.socket.WebSocketMessage;
 import org.springframework.web.reactive.socket.WebSocketSession;
 
 /**
- * Spring {@link WebSocketSession} adapter for JSR 356
+ * Spring {@link WebSocketSession} adapter for a standard Java (JSR 356)
  * {@link javax.websocket.Session}.
  * 
  * @author Violeta Georgieva
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
index 3f827481aa9..1092a854cbe 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/TomcatWebSocketSession.java
@@ -34,16 +34,18 @@ import reactor.core.publisher.MonoProcessor;
  */
 public class TomcatWebSocketSession extends StandardWebSocketSession {
 
-	public TomcatWebSocketSession(Session session, HandshakeInfo info,
-			DataBufferFactory factory) {
+
+	public TomcatWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory) {
 		super(session, info, factory);
 	}
 
-	public TomcatWebSocketSession(Session session, HandshakeInfo info,
-			DataBufferFactory factory, MonoProcessor<Void> completionMono) {
+	public TomcatWebSocketSession(Session session, HandshakeInfo info, DataBufferFactory factory,
+			MonoProcessor<Void> completionMono) {
+
 		super(session, info, factory, completionMono);
 	}
 
+
 	@Override
 	protected boolean canSuspendReceiving() {
 		return true;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
index 0096b7ce8ad..c8dd266524e 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
@@ -114,6 +114,12 @@ public class StandardWebSocketClient extends WebSocketClientSupport implements W
 		});
 	}
 
+	protected StandardWebSocketSession createWebSocketSession(Session session, HandshakeInfo info,
+			MonoProcessor<Void> completion) {
+
+		return new StandardWebSocketSession(session, info, this.bufferFactory, completion);
+	}
+
 	private ClientEndpointConfig createEndpointConfig(Configurator configurator, List<String> subProtocols) {
 		return ClientEndpointConfig.Builder.create()
 				.configurator(configurator)
@@ -121,15 +127,11 @@ public class StandardWebSocketClient extends WebSocketClientSupport implements W
 				.build();
 	}
 
-	protected StandardWebSocketSession createWebSocketSession(Session session, HandshakeInfo info,
-			MonoProcessor<Void> completion) {
-		return new StandardWebSocketSession(session, info, this.bufferFactory, completion);
-	}
-
 	protected DataBufferFactory bufferFactory() {
 		return this.bufferFactory;
 	}
 
+
 	private static final class DefaultConfigurator extends Configurator {
 
 		private final HttpHeaders requestHeaders;
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
index 2408062022f..235d8d462ea 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/TomcatWebSocketClient.java
@@ -32,10 +32,12 @@ import reactor.core.publisher.MonoProcessor;
  */
 public class TomcatWebSocketClient extends StandardWebSocketClient {
 
+
 	@Override
 	protected StandardWebSocketSession createWebSocketSession(Session session,
 			HandshakeInfo info, MonoProcessor<Void> completion) {
-		return new TomcatWebSocketSession(session, info, bufferFactory(), completion);
+
+			return new TomcatWebSocketSession(session, info, bufferFactory(), completion);
 	}
 
 }
\ No newline at end of file