diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
index 6622543..d532663 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
@@ -25,4 +25,6 @@ package com.highcapable.flexiui.component
 
 // TODO: Scaffold, modeled after Scaffold in Material Design
 //       Also set the global background color to Scaffold
-//       Scaffold creates Surface
\ No newline at end of file
+//       Scaffold creates Surface
+
+// TODO: Linkage BetterAndroid SafeArea (SystemBarsController)
\ No newline at end of file
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
index 6ff0343..98e1712 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
@@ -39,8 +39,6 @@ import androidx.compose.ui.platform.debugInspectorInfo
 import com.highcapable.flexiui.LocalColors
 import com.highcapable.flexiui.LocalSizes
 
-// TODO: Linkage BetterAndroid SafeArea (SystemBarsController)
-
 @Immutable
 data class SurfaceColors(
     val contentColor: Color,