diff --git a/lib/constants/apis.dart b/lib/constants/apis.dart
index 1064a6e..2acb36a 100644
--- a/lib/constants/apis.dart
+++ b/lib/constants/apis.dart
@@ -3,9 +3,9 @@ import 'dart:convert';
 // Encode keys to base64 to avoid simple bots from scraping them
 final SUPABASE_API_URL = String.fromCharCodes(
   base64.decode(
-    'aHR0cHM6Ly9nbXF6ZWx' + '2YXVxeml1cmxsb2F3Yi5zdXBhYmFzZS5jbwo=',
+    'aHR0cHM6Ly9nbXF6ZWx2YXVxeml' + '1cmxsb2F3Yi5zdXBhYmFzZS5jbwo=',
   ),
-);
+).trim();
 final SUPABASE_API_KEY = String.fromCharCodes(
   base64.decode(
     'ZXlKaGJHY2lPaUpJVXpJMU5pSXNJblI1Y0NJNklrcFhWQ0o5LmV5SnBjM01pT2lKemRYQmhZbUZ6' +
@@ -13,7 +13,7 @@ final SUPABASE_API_KEY = String.fromCharCodes(
         'MjRpTENKcFlYUWlPakUyTmpBek9ERTVNRGNzSW1WNGNDSTZNVGszTlRrMU56a3dOMzAuRF85NjRF' +
         'SWxEOVdSRm5HNk1XdFF0bUlnMDRlTUJiWmhJRUY3emwtLWJLdwo=',
   ),
-);
+).trim();
 final PEXELS_API_KEY = String.fromCharCodes(
   base64.decode(
     'NTYz' +
@@ -23,4 +23,4 @@ final PEXELS_API_KEY = String.fromCharCodes(
         '0MGU2NjkzNGNlMT' +
         'kzNjdmZjA5NGU2NDMyM2IK',
   ),
-);
+).trim();
diff --git a/lib/screens/welcome_screen.dart b/lib/screens/welcome_screen.dart
index 635d1f4..860363d 100644
--- a/lib/screens/welcome_screen.dart
+++ b/lib/screens/welcome_screen.dart
@@ -42,34 +42,25 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
       body: Padding(
         padding: const EdgeInsets.symmetric(vertical: MEDIUM_SPACE),
         child: Center(
-          child: PageView.builder(
-            itemBuilder: (context, index) {
-              switch (index) {
-                case 0:
-                  return InitialPage(
-                    onNextPage: nextPage,
-                  );
-                case 1:
-                  return GuidePage(
-                    onNextPage: nextPage,
-                    description: localizations
-                        .welcomeScreenCreateMemoriesGuideDescription,
-                    picture: 'assets/images/live_photo.svg',
-                  );
-                case 2:
-                  return GuidePage(
-                    onNextPage: nextPage,
-                    description:
-                        localizations.welcomeScreenViewMemoriesGuideDescription,
-                  );
-                case 3:
-                  return const GetStartedPage();
-                default:
-                  return const SizedBox();
-              }
-            },
+          child: PageView(
             controller: controller,
-            itemCount: 4,
+            children: <Widget>[
+              InitialPage(
+                onNextPage: nextPage,
+              ),
+              GuidePage(
+                onNextPage: nextPage,
+                description:
+                    localizations.welcomeScreenCreateMemoriesGuideDescription,
+                picture: 'assets/images/live_photo.svg',
+              ),
+              GuidePage(
+                onNextPage: nextPage,
+                description:
+                    localizations.welcomeScreenViewMemoriesGuideDescription,
+              ),
+              const GetStartedPage(),
+            ],
           ),
         ),
       ),