diff --git a/android/app/build.gradle b/android/app/build.gradle
index c7397f1..5dc3b07 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.geosmart"
+    namespace = "com.supanadit.geosmart"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.geosmart"
+        applicationId = "com.supanadit.geosmart"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 923cb7c..2f6a350 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:label="geosmart"
+        android:label="Geo Smart App"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
diff --git a/android/app/src/main/kotlin/com/example/geosmart/MainActivity.kt b/android/app/src/main/kotlin/com/supanadit/geosmart/MainActivity.kt
similarity index 74%
rename from android/app/src/main/kotlin/com/example/geosmart/MainActivity.kt
rename to android/app/src/main/kotlin/com/supanadit/geosmart/MainActivity.kt
index 160988c..2b7fcb5 100644
--- a/android/app/src/main/kotlin/com/example/geosmart/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/supanadit/geosmart/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.geosmart
+package com.supanadit.geosmart
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 3218cf1..42ee0c3 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Geo Smart App</string>
-    <string name="api_key">YOUR_API_KEY</string>
+    <string name="api_key">AIzaSyDFr0vWhicDGxcGfbomaoMhxvXHyvjwbFM</string>
 </resources>
\ No newline at end of file
diff --git a/lib/bloc/authentication/authentication_bloc.dart b/lib/bloc/authentication/authentication_bloc.dart
index 79ad339..b358eb0 100644
--- a/lib/bloc/authentication/authentication_bloc.dart
+++ b/lib/bloc/authentication/authentication_bloc.dart
@@ -7,11 +7,9 @@ import 'package:geosmart/service/setting_service.dart';
 
 class AuthenticationBloc
     extends Bloc<AuthenticationEvent, AuthenticationState> {
-  // final Alice alice;
   final Dio dio;
 
   AuthenticationBloc({
-    // @required this.alice,
     required this.dio,
   }) : super(AuthenticationInitial()) {
     on<AuthenticationStarted>((event, emit) async {
diff --git a/lib/page/startup_page.dart b/lib/page/startup_page.dart
index cb3dbee..e17e61d 100644
--- a/lib/page/startup_page.dart
+++ b/lib/page/startup_page.dart
@@ -6,7 +6,8 @@ class StartupPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       body: Center(
-        child: Container(
+        child: SizedBox(
+          height: 50,
           child: Column(
             children: <Widget>[
               Loader(),
@@ -16,7 +17,6 @@ class StartupPage extends StatelessWidget {
               Text("Preparing System")
             ],
           ),
-          height: 50,
         ),
       ),
     );
diff --git a/lib/service/setting_service.dart b/lib/service/setting_service.dart
index 0ab87ff..3a0609d 100644
--- a/lib/service/setting_service.dart
+++ b/lib/service/setting_service.dart
@@ -17,14 +17,14 @@ class SettingService {
   }
 
   Future<SettingModel> clearSetting() async {
-    SharedPreferences sharedPreferences = await this.getSharedPreferences();
+    SharedPreferences sharedPreferences = await getSharedPreferences();
     sharedPreferences.remove(_host);
     sharedPreferences.remove(_id);
     return await getSetting();
   }
 
   Future<SettingModel> getSetting() async {
-    SharedPreferences sharedPreferences = await this.getSharedPreferences();
+    SharedPreferences sharedPreferences = await getSharedPreferences();
     return SettingModel(
       sharedPreferences.getString(_host) ?? '',
       sharedPreferences.getString(_id) ?? '',