diff --git a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
index 73cc7fe499677..b5050008ec71b 100644
--- a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
+++ b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp
@@ -276,10 +276,12 @@ __esimd_lsc_load_bti(__ESIMD_DNS::simd_mask_storage_t<N> pred,
 
 // flat_read4 does flat-address gather4
 template <typename Ty, int N, __ESIMD_NS::rgba_channel_mask Mask>
-__ESIMD_DNS::vector_type_t<Ty, N * get_num_channels_enabled(Mask)>
-    __ESIMD_INTRIN __esimd_svm_gather4_scaled(
-        __ESIMD_DNS::vector_type_t<uint64_t, N> addrs,
-        __ESIMD_DNS::simd_mask_storage_t<N> pred = 1) __ESIMD_INTRIN_END;
+__ESIMD_DNS::vector_type_t<Ty, 
+			    N * get_num_channels_enabled(Mask)>
+__ESIMD_INTRIN
+__esimd_svm_gather4_scaled(__ESIMD_DNS::vector_type_t<uint64_t, N> addrs,
+                           __ESIMD_DNS::simd_mask_storage_t<N> pred = 1) 
+     __ESIMD_INTRIN_END;
 
 // flat_write does flat-address scatter
 template <typename Ty, int N, __ESIMD_NS::rgba_channel_mask Mask>
diff --git a/sycl/test-e2e/ESIMD/unified_memory_api/scatter_usm_legacy.cpp b/sycl/test-e2e/ESIMD/unified_memory_api/scatter_usm_legacy.cpp
index 6f382244920dd..8ef57f63abf37 100644
--- a/sycl/test-e2e/ESIMD/unified_memory_api/scatter_usm_legacy.cpp
+++ b/sycl/test-e2e/ESIMD/unified_memory_api/scatter_usm_legacy.cpp
@@ -1,5 +1,4 @@
-//==------- scatter_usm_legacy.cpp - DPC++ ESIMD on-device test
-//-------------==//
+//==------- scatter_usm_legacy.cpp - DPC++ ESIMD on-device test -----------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.