diff --git a/samples/DemoApp/ViewModels/DemoTabsViewModel.cs b/samples/DemoApp/ViewModels/DemoTabsViewModel.cs
index 1e6e92b..8f73602 100644
--- a/samples/DemoApp/ViewModels/DemoTabsViewModel.cs
+++ b/samples/DemoApp/ViewModels/DemoTabsViewModel.cs
@@ -3,6 +3,9 @@
 
 namespace DemoApp.ViewModels;
 
+/// <summary>
+/// All three tabs (Alpha/Beta/Charlie), share this viewmodel.
+/// </summary>
 public partial class DemoTabsViewModel : BaseViewModel
 {
     #region Constructors
@@ -30,27 +33,27 @@ private async Task GoBack()
     /// Navigate to Alpha tab page.
     /// </summary>
     [RelayCommand]
-    private async Task SwitchToAlphaTabPage()
+    private void SwitchToAlphaTabPage()
     {
-        await navigationService.SelectTab<AlphaTabPage>();
+        navigationService.SelectTab<AlphaTabPage>();
     }
 
     /// <summary>
     /// Navigate to Beta tab page.
     /// </summary>
     [RelayCommand]
-    private async Task SwitchToBetaTabPage()
+    private void SwitchToBetaTabPage()
     {
-        await navigationService.SelectTab<BetaTabPage>();
+        navigationService.SelectTab<BetaTabPage>();
     }
 
     /// <summary>
     /// Navigate to Charlie tab page.
     /// </summary>
     [RelayCommand]
-    private async Task SwitchToCharlieTabPage()
+    private void SwitchToCharlieTabPage()
     {
-        await navigationService.SelectTab<CharlieTabPage>();
+        navigationService.SelectTab<CharlieTabPage>();
     }
 
     #endregion Commands
diff --git a/samples/DemoApp/ViewModels/LoginViewModel.cs b/samples/DemoApp/ViewModels/LoginViewModel.cs
index a8b90ab..cc2a917 100644
--- a/samples/DemoApp/ViewModels/LoginViewModel.cs
+++ b/samples/DemoApp/ViewModels/LoginViewModel.cs
@@ -53,6 +53,7 @@ private async Task Login()
             { "username", Username },
         };
 
+        // after we login, we replace the stack so the user can't go back to the Login page
         await navigationService.ResetStackAndPush<HomePage>(navigationParameters);
     }
 
diff --git a/src/Abstractions/INavigationService.cs b/src/Abstractions/INavigationService.cs
index 15cfb4a..3b7f89e 100644
--- a/src/Abstractions/INavigationService.cs
+++ b/src/Abstractions/INavigationService.cs
@@ -83,7 +83,6 @@ Task ResetStackAndPush<T>(NavigationParameters navigationParameters)
     /// When within a <see cref="TabbedPage"/>, use this method to select a tab.
     /// </summary>
     /// <typeparam name="T">Type of Page</typeparam>
-    /// <returns>A completed task</returns>
-    Task SelectTab<T>()
+    void SelectTab<T>()
         where T : Page;
 }
diff --git a/src/Services/NavigationService.cs b/src/Services/NavigationService.cs
index 32fdf88..e5de371 100644
--- a/src/Services/NavigationService.cs
+++ b/src/Services/NavigationService.cs
@@ -1,7 +1,9 @@
-namespace Burkus.Mvvm.Maui;
+namespace Burkus.Mvvm.Maui;
 
 internal class NavigationService : INavigationService
 {
+    #region Core navigation methods
+
     public async Task Push<T>() where T : Page
     {
         var parameters = new NavigationParameters();
@@ -63,6 +65,10 @@ await HandleNavigation<Page>(async () =>
             navigationParameters);
     }
 
+    #endregion Core navigation methods
+
+    #region Advanced navigation methods
+
     public async Task ReplaceTopPage<T>()
         where T : Page
     {
@@ -115,6 +121,10 @@ await HandleNavigation<Page>(async () =>
             navigationParameters);
     }
 
+    #endregion Advanced navigation methods
+
+    #region Internal implementation
+
     private async Task HandleNavigation<T>(Func<Task> navigationAction, NavigationParameters navigationParameters)
         where T : Page
     {
@@ -143,7 +153,11 @@ private async Task HandleNavigation<T>(Func<Task> navigationAction, NavigationPa
         }
     }
 
-    public async Task SelectTab<T>() where T : Page
+    #endregion Internal implementation
+
+    #region Tab navigation methods
+
+    public void SelectTab<T>() where T : Page
     {
         var tabbedPage = MauiPageUtility.GetTopPage() as TabbedPage;
 
@@ -171,4 +185,6 @@ public async Task SelectTab<T>() where T : Page
             }
         }
     }
+
+    #endregion Tab navigation methods
 }