diff --git a/Samples/MaterialMvvmSample.Android/MainActivity.cs b/Samples/MaterialMvvmSample.Android/MainActivity.cs
index b3f5bf16..cca726db 100644
--- a/Samples/MaterialMvvmSample.Android/MainActivity.cs
+++ b/Samples/MaterialMvvmSample.Android/MainActivity.cs
@@ -22,7 +22,7 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             var app = CommonServiceLocator.ServiceLocator.Current.GetInstance<App>();
 
-            this.LoadApplication(app);
+            LoadApplication(app);
         }
 
         public override void OnBackPressed()
diff --git a/Samples/MaterialMvvmSample.Core/AppContainer.cs b/Samples/MaterialMvvmSample.Core/AppContainer.cs
index 961b460e..ec8580e4 100644
--- a/Samples/MaterialMvvmSample.Core/AppContainer.cs
+++ b/Samples/MaterialMvvmSample.Core/AppContainer.cs
@@ -15,7 +15,7 @@ public void Setup()
         {
             var containerBuilder = new ContainerBuilder();
 
-            this.RegisterServices(containerBuilder);
+            RegisterServices(containerBuilder);
 
             var container = containerBuilder.Build();
 
diff --git a/Samples/MaterialMvvmSample.iOS/AppDelegate.cs b/Samples/MaterialMvvmSample.iOS/AppDelegate.cs
index 4027f560..b58d8c8e 100644
--- a/Samples/MaterialMvvmSample.iOS/AppDelegate.cs
+++ b/Samples/MaterialMvvmSample.iOS/AppDelegate.cs
@@ -15,7 +15,7 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
             var appContainer = new PlatformContainer();
             appContainer.Setup();
 
-            this.LoadApplication(CommonServiceLocator.ServiceLocator.Current.GetInstance<App>());
+            LoadApplication(CommonServiceLocator.ServiceLocator.Current.GetInstance<App>());
 
             return base.FinishedLaunching(uiApplication, launchOptions);
         }
diff --git a/Samples/MaterialMvvmSample.iOS/Main.cs b/Samples/MaterialMvvmSample.iOS/Main.cs
index 5a339dc1..ffbe01df 100644
--- a/Samples/MaterialMvvmSample.iOS/Main.cs
+++ b/Samples/MaterialMvvmSample.iOS/Main.cs
@@ -5,7 +5,7 @@ namespace MaterialMvvmSample.iOS
     public class Application
     {
         // This is the main entry point of the application.
-        static void Main(string[] args)
+        private static void Main(string[] args)
         {
             // if you want to use a different Application Delegate class from "AppDelegate"
             // you can specify it here.
diff --git a/Samples/MaterialMvvmSample/App.xaml.cs b/Samples/MaterialMvvmSample/App.xaml.cs
index b93f27ff..d7343037 100644
--- a/Samples/MaterialMvvmSample/App.xaml.cs
+++ b/Samples/MaterialMvvmSample/App.xaml.cs
@@ -10,7 +10,7 @@ public partial class App : Application
     {
         public App(INavigationService navigationService)
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
             XF.Material.Forms.Material.Init(this, "Material.Style");
 
diff --git a/Samples/MaterialMvvmSample/Controls/CustomNavigationPage.cs b/Samples/MaterialMvvmSample/Controls/CustomNavigationPage.cs
index d99451ed..d7118115 100644
--- a/Samples/MaterialMvvmSample/Controls/CustomNavigationPage.cs
+++ b/Samples/MaterialMvvmSample/Controls/CustomNavigationPage.cs
@@ -19,35 +19,35 @@ public CustomNavigationPage(string rootViewName, object parameter = null) : base
 
         public async Task PopViewAsync()
         {
-            await this.Navigation.PopAsync(true);
+            await Navigation.PopAsync(true);
         }
 
         public async Task PushViewAsync(string rootViewName, object parameter = null)
         {
             _currentNavigationParameter = parameter;
             var view = ViewFactory.GetView(rootViewName);
-            await this.Navigation.PushAsync(view, true);
+            await Navigation.PushAsync(view, true);
         }
 
         public async Task PushModalAsync(string rootViewName, object parameter = null)
         {
             _currentNavigationParameter = parameter;
             var view = ViewFactory.GetView(rootViewName);
-            await this.Navigation.PushModalAsync(view, true);
+            await Navigation.PushModalAsync(view, true);
         }
 
         public async Task PopModalAsync()
         {
-            await this.Navigation.PopModalAsync(true);
+            await Navigation.PopModalAsync(true);
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == nameof(this.RootPage) && this.RootPage != null)
+            if (propertyName == nameof(RootPage) && RootPage != null)
             {
-                this.RootPage.Appearing += this.AppearingHandler;
+                RootPage.Appearing += AppearingHandler;
             }
         }
 
@@ -55,7 +55,11 @@ protected override void OnPagePush(Page page)
         {
             base.OnPagePush(page);
 
-            if (!(page.BindingContext is BaseViewModel viewModel)) return;
+            if (!(page.BindingContext is BaseViewModel viewModel))
+            {
+                return;
+            }
+
             viewModel?.OnViewPushed(_currentNavigationParameter);
             _currentNavigationParameter = null;
         }
@@ -72,10 +76,10 @@ protected override void OnPagePop(Page previousPage, Page poppedPage)
 
         private void AppearingHandler(object sender, EventArgs e)
         {
-            var viewModel = this.RootPage.BindingContext as BaseViewModel;
+            var viewModel = RootPage.BindingContext as BaseViewModel;
             viewModel?.OnViewPushed(_currentNavigationParameter);
             _currentNavigationParameter = null;
-            this.RootPage.Appearing -= this.AppearingHandler;
+            RootPage.Appearing -= AppearingHandler;
         }
     }
 }
diff --git a/Samples/MaterialMvvmSample/ViewModels/BaseViewModel.cs b/Samples/MaterialMvvmSample/ViewModels/BaseViewModel.cs
index 84699259..de9cc5ca 100644
--- a/Samples/MaterialMvvmSample/ViewModels/BaseViewModel.cs
+++ b/Samples/MaterialMvvmSample/ViewModels/BaseViewModel.cs
@@ -11,8 +11,8 @@ public abstract class BaseViewModel : PropertyChangeAware, ICleanUp
 
         protected BaseViewModel()
         {
-            this.ServiceLocator = CommonServiceLocator.ServiceLocator.Current;
-            this.Navigation = this.ServiceLocator.GetInstance<INavigationService>();
+            ServiceLocator = CommonServiceLocator.ServiceLocator.Current;
+            Navigation = ServiceLocator.GetInstance<INavigationService>();
         }
 
         /// <summary>
@@ -26,7 +26,7 @@ public virtual void OnViewPushed(object navigationParameter = null) { }
         /// </summary>
         public virtual void OnViewPopped()
         {
-            this.CleanUp();
+            CleanUp();
         }
 
         public virtual void CleanUp() { }
diff --git a/Samples/MaterialMvvmSample/ViewModels/MainViewModel.cs b/Samples/MaterialMvvmSample/ViewModels/MainViewModel.cs
index d6670409..fe479b32 100644
--- a/Samples/MaterialMvvmSample/ViewModels/MainViewModel.cs
+++ b/Samples/MaterialMvvmSample/ViewModels/MainViewModel.cs
@@ -21,7 +21,7 @@ public MainViewModel(IJobDialogService dialogService)
         {
             _dialogService = dialogService;
 
-            this.Models = new ObservableCollection<TestModel>()
+            Models = new ObservableCollection<TestModel>()
             {
                 new TestModel
                 {
@@ -39,7 +39,7 @@ public MainViewModel(IJobDialogService dialogService)
                     Id = Guid.NewGuid().ToString("N")
                 }
             };
-            this.SelectedFilters = new List<int>();
+            SelectedFilters = new List<int>();
         }
 
         public Color PrimaryColor => Color.Red;
@@ -62,8 +62,8 @@ public string SelectedChoice
             get => _selectedChoice;
             set
             {
-                this.HasError = string.Equals(value, Choices[0]);
-                this.Set(ref _selectedChoice, value);
+                HasError = string.Equals(value, Choices[0]);
+                Set(ref _selectedChoice, value);
             }
         }
 
@@ -71,16 +71,16 @@ public string SelectedChoice
         public bool HasError
         {
             get => _hasError;
-            set => this.Set(ref _hasError, value);
+            set => Set(ref _hasError, value);
         }
 
         public static string[] Filters => new string[] { "None", "Alhpabetical" };
 
         public string[] ListActions => new string[] { "Add job", "Sort" };
 
-        public ICommand ListMenuCommand => new Command<MaterialMenuResult>(async (s) => await this.ListMenuSelected(s));
+        public ICommand ListMenuCommand => new Command<MaterialMenuResult>(async (s) => await ListMenuSelected(s));
 
-        public ICommand MenuCommand => new Command<MaterialMenuResult>(async (s) => await this.MenuSelected(s));
+        public ICommand MenuCommand => new Command<MaterialMenuResult>(async (s) => await MenuSelected(s));
 
         public ICommand FiltersSelectedCommand => new Command<int[]>((s) =>
         {
@@ -98,18 +98,18 @@ public bool HasError
             "ERNI Development Center Philippines, Inc., Bern, Switzerland"
         };
 
-        public ICommand JobSelectedCommand => new Command<string>(async (s) => await this.ViewItemSelected(s));
+        public ICommand JobSelectedCommand => new Command<string>(async (s) => await ViewItemSelected(s));
 
         public ICommand EmailFocusCommand => new Command<bool>((s) =>
         {
-            if (!s && this.Email?.Length > 3)
+            if (!s && Email?.Length > 3)
             {
-                this.EmailHasError = true;
+                EmailHasError = true;
             }
 
-            else if (!s && this.Email?.Length <= 3)
+            else if (!s && Email?.Length <= 3)
             {
-                this.EmailHasError = false;
+                EmailHasError = false;
             }
         });
 
@@ -117,28 +117,28 @@ public bool HasError
         public bool EmailHasError
         {
             get => _emailHasError;
-            set => this.Set(ref _emailHasError, value);
+            set => Set(ref _emailHasError, value);
         }
 
         private string _email;
         public string Email
         {
             get => _email;
-            set => this.Set(ref _email, value);
+            set => Set(ref _email, value);
         }
 
         private ObservableCollection<TestModel> _models;
         public ObservableCollection<TestModel> Models
         {
             get => _models;
-            set => this.Set(ref _models, value);
+            set => Set(ref _models, value);
         }
 
         private List<int> _selectedFilters;
         public List<int> SelectedFilters
         {
             get => _selectedFilters;
-            set => this.Set(ref _selectedFilters, value);
+            set => Set(ref _selectedFilters, value);
         }
 
         private async Task ListMenuSelected(MaterialMenuResult s)
@@ -149,13 +149,13 @@ private async Task ListMenuSelected(MaterialMenuResult s)
                     {
                         var result = await _dialogService.AddNewJob();
 
-                        if (this.Models.Any(m => m.Title == result))
+                        if (Models.Any(m => m.Title == result))
                         {
                             await _dialogService.AlertExistingJob(result);
                         }
                         else if (!string.IsNullOrEmpty(result))
                         {
-                            this.Models.Where(m => m.IsNew).ForEach(m => m.IsNew = false);
+                            Models.Where(m => m.IsNew).ForEach(m => m.IsNew = false);
 
                             var model = new TestModel
                             {
@@ -164,30 +164,30 @@ private async Task ListMenuSelected(MaterialMenuResult s)
                                 IsNew = true
                             };
 
-                            this.Models.Add(model);
+                            Models.Add(model);
                         }
 
                         break;
                     }
                 case 1:
-                    this.Models = new ObservableCollection<TestModel>(this.Models.OrderBy(m => m.Title));
+                    Models = new ObservableCollection<TestModel>(Models.OrderBy(m => m.Title));
                     break;
                 case 2:
-                    this.SelectedFilters = new List<int>();
+                    SelectedFilters = new List<int>();
                     break;
             }
         }
 
         private async Task ViewItemSelected(string id)
         {
-            var selectedModel = this.Models.FirstOrDefault(m => m.Id == id);
+            var selectedModel = Models.FirstOrDefault(m => m.Id == id);
 
-            await this.Navigation.PushAsync(ViewNames.SecondView, selectedModel);
+            await Navigation.PushAsync(ViewNames.SecondView, selectedModel);
         }
 
         private async Task MenuSelected(MaterialMenuResult i)
         {
-            var model = this.Models.FirstOrDefault(m => m.Title == (string)i.Parameter);
+            var model = Models.FirstOrDefault(m => m.Title == (string)i.Parameter);
 
             switch (i.Index)
             {
@@ -213,7 +213,7 @@ private async Task MenuSelected(MaterialMenuResult i)
 
                             if (confirmed == true)
                             {
-                                this.Models.Remove(model);
+                                Models.Remove(model);
 
                                 await _dialogService.JobDeleted();
                             }
@@ -234,19 +234,19 @@ public class TestModel : PropertyChangeAware
         public string Id
         {
             get => _id;
-            set => this.Set(ref _id, value);
+            set => Set(ref _id, value);
         }
 
         public string Title
         {
             get => _title;
-            set => this.Set(ref _title, value);
+            set => Set(ref _title, value);
         }
 
         public bool IsNew
         {
             get => _isNew;
-            set => this.Set(ref _isNew, value);
+            set => Set(ref _isNew, value);
         }
     }
 }
\ No newline at end of file
diff --git a/Samples/MaterialMvvmSample/ViewModels/PropertyChangeAware.cs b/Samples/MaterialMvvmSample/ViewModels/PropertyChangeAware.cs
index 475e2220..cec9a710 100644
--- a/Samples/MaterialMvvmSample/ViewModels/PropertyChangeAware.cs
+++ b/Samples/MaterialMvvmSample/ViewModels/PropertyChangeAware.cs
@@ -27,15 +27,19 @@ public abstract class PropertyChangeAware : INotifyPropertyChanged
         {
             if (!EqualityComparer<T>.Default.Equals(field, default(T)))
             {
-                if (field.Equals(newValue)) return;
+                if (field.Equals(newValue))
+                {
+                    return;
+                }
+
                 field = newValue;
-                this.OnPropertyChanged(propertyName);
+                OnPropertyChanged(propertyName);
             }
 
             else if (!EqualityComparer<T>.Default.Equals(newValue, default(T)))
             {
                 field = newValue;
-                this.OnPropertyChanged(propertyName);
+                OnPropertyChanged(propertyName);
             }
         }
 
@@ -45,7 +49,7 @@ public abstract class PropertyChangeAware : INotifyPropertyChanged
         /// <param name="propertyName">The name of the property who's value has changed.</param>
         protected virtual void OnPropertyChanged([CallerMemberName]string propertyName = null)
         {
-            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }
diff --git a/Samples/MaterialMvvmSample/ViewModels/SecondViewModel.cs b/Samples/MaterialMvvmSample/ViewModels/SecondViewModel.cs
index 2a059361..532706d9 100644
--- a/Samples/MaterialMvvmSample/ViewModels/SecondViewModel.cs
+++ b/Samples/MaterialMvvmSample/ViewModels/SecondViewModel.cs
@@ -6,13 +6,13 @@ public class SecondViewModel : BaseViewModel
         public string JobTitle
         {
             get => _jobTitle;
-            set => this.Set(ref _jobTitle, value);
+            set => Set(ref _jobTitle, value);
         }
 
         public override void OnViewPushed(object navigationParameter = null)
         {
             var selectedJob = (TestModel)navigationParameter;
-            this.JobTitle = selectedJob?.Title;
+            JobTitle = selectedJob?.Title;
         }
     }
 }
diff --git a/Samples/MaterialMvvmSample/Views/BaseView.cs b/Samples/MaterialMvvmSample/Views/BaseView.cs
index ddb89633..8ac4f883 100644
--- a/Samples/MaterialMvvmSample/Views/BaseView.cs
+++ b/Samples/MaterialMvvmSample/Views/BaseView.cs
@@ -11,9 +11,9 @@ public abstract class BaseView<TViewModel> : ContentPage where TViewModel : Base
 
         protected BaseView()
         {
-            this.ViewModel = CommonServiceLocator.ServiceLocator.Current.GetInstance<TViewModel>();
-            this.BindingContext = this.ViewModel;
-            this.On<iOS>().SetUseSafeArea(true);
+            ViewModel = CommonServiceLocator.ServiceLocator.Current.GetInstance<TViewModel>();
+            BindingContext = ViewModel;
+            On<iOS>().SetUseSafeArea(true);
         }
     }
 }
diff --git a/Samples/MaterialMvvmSample/Views/MainView.xaml.cs b/Samples/MaterialMvvmSample/Views/MainView.xaml.cs
index 93affb80..4a60685b 100644
--- a/Samples/MaterialMvvmSample/Views/MainView.xaml.cs
+++ b/Samples/MaterialMvvmSample/Views/MainView.xaml.cs
@@ -8,7 +8,7 @@ public partial class MainView : BaseMainView
     {
         public MainView()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
     }
 
diff --git a/Samples/MaterialMvvmSample/Views/SecondView.xaml.cs b/Samples/MaterialMvvmSample/Views/SecondView.xaml.cs
index ac0d435b..976d2125 100644
--- a/Samples/MaterialMvvmSample/Views/SecondView.xaml.cs
+++ b/Samples/MaterialMvvmSample/Views/SecondView.xaml.cs
@@ -8,7 +8,7 @@ public partial class SecondView : BaseSecondView
     {
         public SecondView()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
     }
 
diff --git a/XF.Material/FormsResources/MaterialColorConfiguration.cs b/XF.Material/FormsResources/MaterialColorConfiguration.cs
index dddedcdb..904a6610 100644
--- a/XF.Material/FormsResources/MaterialColorConfiguration.cs
+++ b/XF.Material/FormsResources/MaterialColorConfiguration.cs
@@ -73,8 +73,8 @@ public sealed class MaterialColorConfiguration : BindableObject
         /// </summary>
         public Color Background
         {
-            get => (Color)this.GetValue(BackgroundProperty);
-            set => this.SetValue(BackgroundProperty, value);
+            get => (Color)GetValue(BackgroundProperty);
+            set => SetValue(BackgroundProperty, value);
         }
 
         /// <summary>
@@ -82,8 +82,8 @@ public Color Background
         /// </summary>
         public Color Error
         {
-            get => (Color)this.GetValue(ErrorProperty);
-            set => this.SetValue(ErrorProperty, value);
+            get => (Color)GetValue(ErrorProperty);
+            set => SetValue(ErrorProperty, value);
         }
 
         /// <summary>
@@ -91,8 +91,8 @@ public Color Error
         /// </summary>
         public Color OnBackground
         {
-            get => (Color)this.GetValue(OnBackgroundProperty);
-            set => this.SetValue(OnBackgroundProperty, value);
+            get => (Color)GetValue(OnBackgroundProperty);
+            set => SetValue(OnBackgroundProperty, value);
         }
 
         /// <summary>
@@ -100,8 +100,8 @@ public Color OnBackground
         /// </summary>
         public Color OnError
         {
-            get => (Color)this.GetValue(OnErrorProperty);
-            set => this.SetValue(OnErrorProperty, value);
+            get => (Color)GetValue(OnErrorProperty);
+            set => SetValue(OnErrorProperty, value);
         }
 
         /// <summary>
@@ -109,8 +109,8 @@ public Color OnError
         /// </summary>
         public Color OnPrimary
         {
-            get => (Color)this.GetValue(OnPrimaryProperty);
-            set => this.SetValue(OnPrimaryProperty, value);
+            get => (Color)GetValue(OnPrimaryProperty);
+            set => SetValue(OnPrimaryProperty, value);
         }
 
         /// <summary>
@@ -120,12 +120,12 @@ public Color OnSecondary
         {
             get
             {
-                var color = (Color)this.GetValue(OnSecondaryProperty);
+                var color = (Color)GetValue(OnSecondaryProperty);
 
-                return color.IsDefault ? this.OnPrimary : color;
+                return color.IsDefault ? OnPrimary : color;
             }
 
-            set => this.SetValue(OnSecondaryProperty, value);
+            set => SetValue(OnSecondaryProperty, value);
         }
 
         /// <summary>
@@ -133,8 +133,8 @@ public Color OnSecondary
         /// </summary>
         public Color OnSurface
         {
-            get => (Color)this.GetValue(OnSurfaceProperty);
-            set => this.SetValue(OnSurfaceProperty, value);
+            get => (Color)GetValue(OnSurfaceProperty);
+            set => SetValue(OnSurfaceProperty, value);
         }
 
         /// <summary>
@@ -142,8 +142,8 @@ public Color OnSurface
         /// </summary>
         public Color Primary
         {
-            get => (Color)this.GetValue(PrimaryProperty);
-            set => this.SetValue(PrimaryProperty, value);
+            get => (Color)GetValue(PrimaryProperty);
+            set => SetValue(PrimaryProperty, value);
         }
 
         /// <summary>
@@ -151,8 +151,8 @@ public Color Primary
         /// </summary>
         public Color PrimaryVariant
         {
-            get => (Color)this.GetValue(PrimaryVariantProperty);
-            set => this.SetValue(PrimaryVariantProperty, value);
+            get => (Color)GetValue(PrimaryVariantProperty);
+            set => SetValue(PrimaryVariantProperty, value);
         }
 
         /// <summary>
@@ -163,16 +163,16 @@ public Color Secondary
         {
             get
             {
-                var color = (Color)this.GetValue(SecondaryProperty);
+                var color = (Color)GetValue(SecondaryProperty);
 
-                if (color.IsDefault && this.Primary.IsDefault)
+                if (color.IsDefault && Primary.IsDefault)
                 {
                     return Color.Accent;
                 }
 
-                return color.IsDefault ? this.Primary : color;
+                return color.IsDefault ? Primary : color;
             }
-            set => this.SetValue(SecondaryProperty, value);
+            set => SetValue(SecondaryProperty, value);
         }
 
         /// <summary>
@@ -180,8 +180,8 @@ public Color Secondary
         /// </summary>
         public Color SecondaryVariant
         {
-            get => (Color)this.GetValue(SecondaryVariantProperty);
-            set => this.SetValue(SecondaryVariantProperty, value);
+            get => (Color)GetValue(SecondaryVariantProperty);
+            set => SetValue(SecondaryVariantProperty, value);
         }
 
         /// <summary>
@@ -189,8 +189,8 @@ public Color SecondaryVariant
         /// </summary>
         public Color Surface
         {
-            get => (Color)this.GetValue(SurfaceProperty);
-            set => this.SetValue(SurfaceProperty, value);
+            get => (Color)GetValue(SurfaceProperty);
+            set => SetValue(SurfaceProperty, value);
         }
     }
 }
diff --git a/XF.Material/FormsResources/MaterialColors.xaml.cs b/XF.Material/FormsResources/MaterialColors.xaml.cs
index de09ee3b..29ce1048 100644
--- a/XF.Material/FormsResources/MaterialColors.xaml.cs
+++ b/XF.Material/FormsResources/MaterialColors.xaml.cs
@@ -8,24 +8,24 @@ public partial class MaterialColors : ResourceDictionary
     {
         internal MaterialColors(MaterialColorConfiguration materialColor)
         {
-            this.InitializeComponent();
-            this.SetColors(materialColor);
+            InitializeComponent();
+            SetColors(materialColor);
         }
 
         private void SetColors(MaterialColorConfiguration materialColor)
         {
-            this.TryAddColorResource(MaterialConstants.Color.PRIMARY, materialColor.Primary);
-            this.TryAddColorResource(MaterialConstants.Color.PRIMARY_VARIANT, materialColor.PrimaryVariant);
-            this.TryAddColorResource(MaterialConstants.Color.ON_PRIMARY, materialColor.OnPrimary);
-            this.TryAddColorResource(MaterialConstants.Color.SECONDARY, materialColor.Secondary);
-            this.TryAddColorResource(MaterialConstants.Color.SECONDARY_VARIANT, materialColor.SecondaryVariant);
-            this.TryAddColorResource(MaterialConstants.Color.ON_SECONDARY, materialColor.OnSecondary);
-            this.TryAddColorResource(MaterialConstants.Color.BACKGROUND, materialColor.Background);
-            this.TryAddColorResource(MaterialConstants.Color.ON_BACKGROUND, materialColor.OnBackground);
-            this.TryAddColorResource(MaterialConstants.Color.SURFACE, materialColor.Surface);
-            this.TryAddColorResource(MaterialConstants.Color.ON_SURFACE, materialColor.OnSurface);
-            this.TryAddColorResource(MaterialConstants.Color.ERROR, materialColor.Error);
-            this.TryAddColorResource(MaterialConstants.Color.ON_ERROR, materialColor.OnError);
+            TryAddColorResource(MaterialConstants.Color.PRIMARY, materialColor.Primary);
+            TryAddColorResource(MaterialConstants.Color.PRIMARY_VARIANT, materialColor.PrimaryVariant);
+            TryAddColorResource(MaterialConstants.Color.ON_PRIMARY, materialColor.OnPrimary);
+            TryAddColorResource(MaterialConstants.Color.SECONDARY, materialColor.Secondary);
+            TryAddColorResource(MaterialConstants.Color.SECONDARY_VARIANT, materialColor.SecondaryVariant);
+            TryAddColorResource(MaterialConstants.Color.ON_SECONDARY, materialColor.OnSecondary);
+            TryAddColorResource(MaterialConstants.Color.BACKGROUND, materialColor.Background);
+            TryAddColorResource(MaterialConstants.Color.ON_BACKGROUND, materialColor.OnBackground);
+            TryAddColorResource(MaterialConstants.Color.SURFACE, materialColor.Surface);
+            TryAddColorResource(MaterialConstants.Color.ON_SURFACE, materialColor.OnSurface);
+            TryAddColorResource(MaterialConstants.Color.ERROR, materialColor.Error);
+            TryAddColorResource(MaterialConstants.Color.ON_ERROR, materialColor.OnError);
         }
 
         private void TryAddColorResource(string key, Color color)
@@ -35,7 +35,7 @@ private void TryAddColorResource(string key, Color color)
                 return;
             }
 
-            this.Add(key, color);
+            Add(key, color);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/FormsResources/MaterialConfiguration.cs b/XF.Material/FormsResources/MaterialConfiguration.cs
index 00748edc..ccec9729 100644
--- a/XF.Material/FormsResources/MaterialConfiguration.cs
+++ b/XF.Material/FormsResources/MaterialConfiguration.cs
@@ -24,8 +24,8 @@ public class MaterialConfiguration : BindableObject
         /// </summary>
         public MaterialFontConfiguration FontConfiguration
         {
-            get => (MaterialFontConfiguration)this.GetValue(FontConfigurationProperty);
-            set => this.SetValue(FontConfigurationProperty, value);
+            get => (MaterialFontConfiguration)GetValue(FontConfigurationProperty);
+            set => SetValue(FontConfigurationProperty, value);
         }
 
         /// <summary>
@@ -33,8 +33,8 @@ public MaterialFontConfiguration FontConfiguration
         /// </summary>
         public MaterialColorConfiguration ColorConfiguration
         {
-            get => (MaterialColorConfiguration)this.GetValue(ColorConfigurationProperty);
-            set => this.SetValue(ColorConfigurationProperty, value);
+            get => (MaterialColorConfiguration)GetValue(ColorConfigurationProperty);
+            set => SetValue(ColorConfigurationProperty, value);
         }
     }
 }
diff --git a/XF.Material/FormsResources/MaterialSizes.xaml.cs b/XF.Material/FormsResources/MaterialSizes.xaml.cs
index 1765b8f5..ea6e4abc 100644
--- a/XF.Material/FormsResources/MaterialSizes.xaml.cs
+++ b/XF.Material/FormsResources/MaterialSizes.xaml.cs
@@ -8,7 +8,7 @@ public partial class MaterialSizes : ResourceDictionary
     {
         public MaterialSizes()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/FormsResources/Typography/MaterialFontConfiguration.cs b/XF.Material/FormsResources/Typography/MaterialFontConfiguration.cs
index 49d3e88f..440b03d6 100644
--- a/XF.Material/FormsResources/Typography/MaterialFontConfiguration.cs
+++ b/XF.Material/FormsResources/Typography/MaterialFontConfiguration.cs
@@ -77,8 +77,8 @@ public sealed class MaterialFontConfiguration : BindableObject
         /// </summary>
         public string Body1
         {
-            get => this.GetValue(Body1Property)?.ToString();
-            set => this.SetValue(Body1Property, value);
+            get => GetValue(Body1Property)?.ToString();
+            set => SetValue(Body1Property, value);
         }
 
         /// <summary>
@@ -86,8 +86,8 @@ public string Body1
         /// </summary>
         public string Body2
         {
-            get => this.GetValue(H1Property)?.ToString();
-            set => this.SetValue(H1Property, value);
+            get => GetValue(H1Property)?.ToString();
+            set => SetValue(H1Property, value);
         }
 
         /// <summary>
@@ -95,8 +95,8 @@ public string Body2
         /// </summary>
         public string Button
         {
-            get => this.GetValue(ButtonProperty)?.ToString();
-            set => this.SetValue(ButtonProperty, value);
+            get => GetValue(ButtonProperty)?.ToString();
+            set => SetValue(ButtonProperty, value);
         }
 
         /// <summary>
@@ -104,8 +104,8 @@ public string Button
         /// </summary>
         public string Caption
         {
-            get => this.GetValue(CaptionProperty)?.ToString();
-            set => this.SetValue(CaptionProperty, value);
+            get => GetValue(CaptionProperty)?.ToString();
+            set => SetValue(CaptionProperty, value);
         }
 
         /// <summary>
@@ -113,8 +113,8 @@ public string Caption
         /// </summary>
         public string H1
         {
-            get => this.GetValue(H1Property)?.ToString();
-            set => this.SetValue(H1Property, value);
+            get => GetValue(H1Property)?.ToString();
+            set => SetValue(H1Property, value);
         }
 
         /// <summary>
@@ -122,8 +122,8 @@ public string H1
         /// </summary>
         public string H2
         {
-            get => this.GetValue(H2Property)?.ToString();
-            set => this.SetValue(H2Property, value);
+            get => GetValue(H2Property)?.ToString();
+            set => SetValue(H2Property, value);
         }
 
         /// <summary>
@@ -131,8 +131,8 @@ public string H2
         /// </summary>
         public string H3
         {
-            get => this.GetValue(H3Property)?.ToString();
-            set => this.SetValue(H3Property, value);
+            get => GetValue(H3Property)?.ToString();
+            set => SetValue(H3Property, value);
         }
 
         /// <summary>
@@ -140,8 +140,8 @@ public string H3
         /// </summary>
         public string H4
         {
-            get => this.GetValue(H4Property)?.ToString();
-            set => this.SetValue(H4Property, value);
+            get => GetValue(H4Property)?.ToString();
+            set => SetValue(H4Property, value);
         }
 
         /// <summary>
@@ -149,8 +149,8 @@ public string H4
         /// </summary>
         public string H5
         {
-            get => this.GetValue(H5Property)?.ToString();
-            set => this.SetValue(H5Property, value);
+            get => GetValue(H5Property)?.ToString();
+            set => SetValue(H5Property, value);
         }
 
         /// <summary>
@@ -158,8 +158,8 @@ public string H5
         /// </summary>
         public string H6
         {
-            get => this.GetValue(H6Property)?.ToString();
-            set => this.SetValue(H6Property, value);
+            get => GetValue(H6Property)?.ToString();
+            set => SetValue(H6Property, value);
         }
 
         /// <summary>
@@ -167,8 +167,8 @@ public string H6
         /// </summary>
         public string Overline
         {
-            get => this.GetValue(OverlineProperty)?.ToString();
-            set => this.SetValue(OverlineProperty, value);
+            get => GetValue(OverlineProperty)?.ToString();
+            set => SetValue(OverlineProperty, value);
         }
 
         /// <summary>
@@ -176,8 +176,8 @@ public string Overline
         /// </summary>
         public string Subtitle1
         {
-            get => this.GetValue(Subtitle1Property)?.ToString();
-            set => this.SetValue(Subtitle1Property, value);
+            get => GetValue(Subtitle1Property)?.ToString();
+            set => SetValue(Subtitle1Property, value);
         }
 
         /// <summary>
@@ -185,8 +185,8 @@ public string Subtitle1
         /// </summary>
         public string Subtitle2
         {
-            get => this.GetValue(Subtitle2Property)?.ToString();
-            set => this.SetValue(Subtitle2Property, value);
+            get => GetValue(Subtitle2Property)?.ToString();
+            set => SetValue(Subtitle2Property, value);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/FormsResources/Typography/MaterialTypography.xaml.cs b/XF.Material/FormsResources/Typography/MaterialTypography.xaml.cs
index 35823103..706615ab 100644
--- a/XF.Material/FormsResources/Typography/MaterialTypography.xaml.cs
+++ b/XF.Material/FormsResources/Typography/MaterialTypography.xaml.cs
@@ -8,27 +8,31 @@ public partial class MaterialTypography : ResourceDictionary
     {
         internal MaterialTypography(MaterialFontConfiguration fontFamily)
         {
-            this.InitializeComponent();
+            InitializeComponent();
 
-            if (fontFamily == null) return;
-            this.TryAddStringResource(MaterialConstants.FontFamily.H1, fontFamily.H1);
-            this.TryAddStringResource(MaterialConstants.FontFamily.H2, fontFamily.H2);
-            this.TryAddStringResource(MaterialConstants.FontFamily.H3, fontFamily.H3);
-            this.TryAddStringResource(MaterialConstants.FontFamily.H4, fontFamily.H4);
-            this.TryAddStringResource(MaterialConstants.FontFamily.H5, fontFamily.H5);
-            this.TryAddStringResource(MaterialConstants.FontFamily.H6, fontFamily.H6);
-            this.TryAddStringResource(MaterialConstants.FontFamily.SUBTITLE1, fontFamily.Subtitle1);
-            this.TryAddStringResource(MaterialConstants.FontFamily.SUBTITLE2, fontFamily.Subtitle2);
-            this.TryAddStringResource(MaterialConstants.FontFamily.BODY1, fontFamily.Body1);
-            this.TryAddStringResource(MaterialConstants.FontFamily.BODY2, fontFamily.Body2);
-            this.TryAddStringResource(MaterialConstants.FontFamily.BUTTON, fontFamily.Button);
-            this.TryAddStringResource(MaterialConstants.FontFamily.CAPTION, fontFamily.Caption);
-            this.TryAddStringResource(MaterialConstants.FontFamily.OVERLINE, fontFamily.Overline);
+            if (fontFamily == null)
+            {
+                return;
+            }
+
+            TryAddStringResource(MaterialConstants.FontFamily.H1, fontFamily.H1);
+            TryAddStringResource(MaterialConstants.FontFamily.H2, fontFamily.H2);
+            TryAddStringResource(MaterialConstants.FontFamily.H3, fontFamily.H3);
+            TryAddStringResource(MaterialConstants.FontFamily.H4, fontFamily.H4);
+            TryAddStringResource(MaterialConstants.FontFamily.H5, fontFamily.H5);
+            TryAddStringResource(MaterialConstants.FontFamily.H6, fontFamily.H6);
+            TryAddStringResource(MaterialConstants.FontFamily.SUBTITLE1, fontFamily.Subtitle1);
+            TryAddStringResource(MaterialConstants.FontFamily.SUBTITLE2, fontFamily.Subtitle2);
+            TryAddStringResource(MaterialConstants.FontFamily.BODY1, fontFamily.Body1);
+            TryAddStringResource(MaterialConstants.FontFamily.BODY2, fontFamily.Body2);
+            TryAddStringResource(MaterialConstants.FontFamily.BUTTON, fontFamily.Button);
+            TryAddStringResource(MaterialConstants.FontFamily.CAPTION, fontFamily.Caption);
+            TryAddStringResource(MaterialConstants.FontFamily.OVERLINE, fontFamily.Overline);
         }
 
         private void TryAddStringResource(string key, string value)
         {
-            this.Add(key, value);
+            Add(key, value);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Models/MaterialMenuResult.cs b/XF.Material/Models/MaterialMenuResult.cs
index 9205f5c9..212ad4f4 100644
--- a/XF.Material/Models/MaterialMenuResult.cs
+++ b/XF.Material/Models/MaterialMenuResult.cs
@@ -17,8 +17,8 @@ public class MaterialMenuResult
 
         internal MaterialMenuResult(int index, object parameter)
         {
-            this.Index = index;
-            this.Parameter = parameter;
+            Index = index;
+            Parameter = parameter;
         }
     }
 }
diff --git a/XF.Material/Platforms/Android/Renderers/Internals/MaterialBoxViewRenderer.cs b/XF.Material/Platforms/Android/Renderers/Internals/MaterialBoxViewRenderer.cs
index 47a427b4..17abb5a0 100644
--- a/XF.Material/Platforms/Android/Renderers/Internals/MaterialBoxViewRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/Internals/MaterialBoxViewRenderer.cs
@@ -19,8 +19,8 @@ public bool OnTouch(Android.Views.View v, MotionEvent e)
         {
             var percentageX = e.GetX() / v.Width;
             var percentageY = e.GetY() / v.Height;
-            var elementX = percentageX * this.Element.Width;
-            var elementY = percentageY * this.Element.Height;
+            var elementX = percentageX * Element.Width;
+            var elementY = percentageY * Element.Height;
 
             _boxView.OnTapped(elementX, elementY);
 
@@ -31,10 +31,14 @@ protected override void OnElementChanged(ElementChangedEventArgs<BoxView> e)
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
-            _boxView = this.Element as MaterialBoxView;
-            this.ViewGroup.SetOnTouchListener(null);
-            this.ViewGroup.SetOnTouchListener(this);
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
+            _boxView = Element as MaterialBoxView;
+            ViewGroup.SetOnTouchListener(null);
+            ViewGroup.SetOnTouchListener(this);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Android/Renderers/Internals/MaterialDatePickerRenderer.cs b/XF.Material/Platforms/Android/Renderers/Internals/MaterialDatePickerRenderer.cs
index 6653cae9..5faee440 100644
--- a/XF.Material/Platforms/Android/Renderers/Internals/MaterialDatePickerRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/Internals/MaterialDatePickerRenderer.cs
@@ -21,8 +21,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.D
 
             if (e?.NewElement != null)
             {
-                _materialDatePicker = this.Element as MaterialDatePicker;
-                this.SetControl();
+                _materialDatePicker = Element as MaterialDatePicker;
+                SetControl();
             }
         }
 
@@ -33,19 +33,19 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
         private void SetControl()
         {
-            if (this.Control == null)
+            if (Control == null)
             {
                 return;
             }
 
-            this.Control.Background = new ColorDrawable(Color.Transparent.ToAndroid());
-            this.Control.SetPadding(0, 0, 0, 0);
-            this.Control.SetIncludeFontPadding(false);
-            this.Control.SetMinimumHeight((int)MaterialHelper.ConvertToDp(20));
+            Control.Background = new ColorDrawable(Color.Transparent.ToAndroid());
+            Control.SetPadding(0, 0, 0, 0);
+            Control.SetIncludeFontPadding(false);
+            Control.SetMinimumHeight((int)MaterialHelper.ConvertToDp(20));
 
-            var layoutParams = new MarginLayoutParams(this.Control.LayoutParameters);
+            var layoutParams = new MarginLayoutParams(Control.LayoutParameters);
             layoutParams.SetMargins(0, 0, 0, 0);
-            this.Control.LayoutParameters = layoutParams;
+            Control.LayoutParameters = layoutParams;
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Android/Renderers/Internals/MaterialElementRenderer.cs b/XF.Material/Platforms/Android/Renderers/Internals/MaterialElementRenderer.cs
index 51e338e5..1608f9fe 100644
--- a/XF.Material/Platforms/Android/Renderers/Internals/MaterialElementRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/Internals/MaterialElementRenderer.cs
@@ -19,12 +19,12 @@ protected override void OnElementChanged(ElementChangedEventArgs<View> e)
 
             if (e?.OldElement != null)
             {
-                (this.Element as IMaterialElementConfiguration)?.ElementChanged(false);
+                (Element as IMaterialElementConfiguration)?.ElementChanged(false);
             }
 
             if (e?.NewElement != null)
             {
-                (this.Element as IMaterialElementConfiguration)?.ElementChanged(true);
+                (Element as IMaterialElementConfiguration)?.ElementChanged(true);
             }
         }
     }
diff --git a/XF.Material/Platforms/Android/Renderers/Internals/MaterialEntryRenderer.cs b/XF.Material/Platforms/Android/Renderers/Internals/MaterialEntryRenderer.cs
index 3e7bf1f0..76a2bb1b 100644
--- a/XF.Material/Platforms/Android/Renderers/Internals/MaterialEntryRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/Internals/MaterialEntryRenderer.cs
@@ -27,9 +27,9 @@ protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
 
             if (e?.NewElement != null)
             {
-                this.ChangeCursorColor();
-                _materialEntry = this.Element as MaterialEntry;
-                this.SetControl();
+                ChangeCursorColor();
+                _materialEntry = Element as MaterialEntry;
+                SetControl();
             }
         }
 
@@ -39,21 +39,21 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
             if (e?.PropertyName == nameof(MaterialEntry.TintColor))
             {
-                this.ChangeCursorColor();
+                ChangeCursorColor();
             }
         }
 
         private void SetControl()
         {
-            if (this.Control == null)
+            if (Control == null)
             {
                 return;
             }
 
-            this.Control.Background = new ColorDrawable(Color.Transparent.ToAndroid());
-            this.Control.SetPadding(0, 0, 0, 0);
-            this.Control.SetIncludeFontPadding(false);
-            this.Control.SetMinimumHeight((int)MaterialHelper.ConvertToDp(20));
+            Control.Background = new ColorDrawable(Color.Transparent.ToAndroid());
+            Control.SetPadding(0, 0, 0, 0);
+            Control.SetIncludeFontPadding(false);
+            Control.SetMinimumHeight((int)MaterialHelper.ConvertToDp(20));
 
             //// DEV HINT: This will be used for the future control `MaterialTextArea`.
             //// This removes the 'Next' button and shows a 'Done' button when the device's orientation is in landscape.
@@ -64,7 +64,7 @@ private void SetControl()
 
         private void ChangeCursorColor()
         {
-            if (this.Control == null)
+            if (Control == null)
             {
                 return;
             }
@@ -73,15 +73,15 @@ private void ChangeCursorColor()
             {
                 var field = Java.Lang.Class.FromType(typeof(Android.Widget.TextView)).GetDeclaredField("mCursorDrawableRes");
                 field.Accessible = true;
-                var resId = field.GetInt(this.Control);
+                var resId = field.GetInt(Control);
 
                 field = Java.Lang.Class.FromType(typeof(Android.Widget.TextView)).GetDeclaredField("mEditor");
                 field.Accessible = true;
 
-                var cursorDrawable = ContextCompat.GetDrawable(this.Context, resId);
-                cursorDrawable.SetColorFilter(((MaterialEntry)this.Element).TintColor.ToAndroid(), Android.Graphics.PorterDuff.Mode.SrcIn);
+                var cursorDrawable = ContextCompat.GetDrawable(Context, resId);
+                cursorDrawable.SetColorFilter(((MaterialEntry)Element).TintColor.ToAndroid(), Android.Graphics.PorterDuff.Mode.SrcIn);
 
-                var editor = field.Get(this.Control);
+                var editor = field.Get(Control);
                 field = editor.Class.GetDeclaredField("mCursorDrawable");
                 field.Accessible = true;
                 field.Set(editor, new[] { cursorDrawable, cursorDrawable });
@@ -94,11 +94,11 @@ private void ChangeCursorColor()
 
         public bool OnEditorAction(TextView v, [GeneratedEnum] ImeAction actionId, KeyEvent e)
         {
-            var currentFocus = (this.Context as Activity).CurrentFocus;
+            var currentFocus = (Context as Activity).CurrentFocus;
 
             if (currentFocus != null)
             {
-                var inputMethodManager = (InputMethodManager)(this.Context as Activity).GetSystemService(Context.InputMethodService);
+                var inputMethodManager = (InputMethodManager)(Context as Activity).GetSystemService(Context.InputMethodService);
                 inputMethodManager.HideSoftInputFromWindow(currentFocus.WindowToken, HideSoftInputFlags.None);
             }
 
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialButtonRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialButtonRenderer.cs
index 091a5050..2df1ec06 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialButtonRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialButtonRenderer.cs
@@ -25,45 +25,55 @@ protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
         {
             base.OnElementChanged(e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (e?.OldElement != null)
             {
                 _helper.Clean();
             }
 
-            if (e?.NewElement == null) return;
-            _materialButton = this.Element as MaterialButton;
-            _helper = new MaterialDrawableHelper(_materialButton, this.Control);
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
+            _materialButton = Element as MaterialButton;
+            _helper = new MaterialDrawableHelper(_materialButton, Control);
             _helper.UpdateDrawable();
 
-            this.Control.SetMinimumWidth((int)MaterialHelper.ConvertToDp(64));
-            this.Control.SetAllCaps(_materialButton != null && _materialButton.AllCaps);
+            Control.SetMinimumWidth((int)MaterialHelper.ConvertToDp(64));
+            Control.SetAllCaps(_materialButton != null && _materialButton.AllCaps);
 
-            this.SetButtonIcon();
-            this.SetTextColors();
-            this.SetTextLetterSpacing();
+            SetButtonIcon();
+            SetTextColors();
+            SetTextLetterSpacing();
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             base.OnElementPropertyChanged(sender, e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             switch (e?.PropertyName)
             {
                 case nameof(MaterialButton.Image):
-                    this.SetButtonIcon();
+                    SetButtonIcon();
                     break;
                 case nameof(MaterialButton.AllCaps):
-                    this.Control.SetAllCaps(_materialButton.AllCaps);
+                    Control.SetAllCaps(_materialButton.AllCaps);
                     break;
                 case nameof(Button.TextColor):
-                    this.SetTextColors();
+                    SetTextColors();
                     break;
                 case nameof(MaterialButton.LetterSpacing):
-                    this.SetTextLetterSpacing();
+                    SetTextLetterSpacing();
                     break;
             }
         }
@@ -73,11 +83,17 @@ private void SetButtonIcon()
             var withIcon = !string.IsNullOrEmpty(_materialButton.Image);
             _helper.UpdateHasIcon(withIcon);
 
-            if (!withIcon) return;
+            if (!withIcon)
+            {
+                return;
+            }
 
-            var drawable = this.Control.GetCompoundDrawables().FirstOrDefault(s => s != null);
+            var drawable = Control.GetCompoundDrawables().FirstOrDefault(s => s != null);
 
-            if (drawable == null) return;
+            if (drawable == null)
+            {
+                return;
+            }
 
             var drawableCopy = drawable.GetDrawableCopy();
             var width = _materialButton.ButtonType == MaterialButtonType.Text ? (int)MaterialHelper.ConvertToDp(18) : (int)MaterialHelper.ConvertToDp(18 + 4);
@@ -86,8 +102,8 @@ private void SetButtonIcon()
             drawableCopy.SetBounds(left, 0, width, height);
             drawableCopy.TintDrawable(_materialButton.TextColor.ToAndroid());
 
-            this.Control.SetCompoundDrawables(drawableCopy, null, null, null);
-            this.Control.CompoundDrawablePadding = 0;
+            Control.SetCompoundDrawables(drawableCopy, null, null, null);
+            Control.CompoundDrawablePadding = 0;
         }
         private void SetTextColors()
         {
@@ -109,13 +125,13 @@ private void SetTextColors()
                 _materialButton.TextColor.MultiplyAlpha(0.38).ToAndroid()
              };
 
-            this.Control.SetTextColor(new ColorStateList(states, colors));
+            Control.SetTextColor(new ColorStateList(states, colors));
         }
 
         private void SetTextLetterSpacing()
         {
-            var rawLetterSpacing = _materialButton.LetterSpacing / this.Control.TextSize;
-            this.Control.LetterSpacing = MaterialHelper.ConvertToSp(rawLetterSpacing);
+            var rawLetterSpacing = _materialButton.LetterSpacing / Control.TextSize;
+            Control.LetterSpacing = MaterialHelper.ConvertToSp(rawLetterSpacing);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialCardRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialCardRenderer.cs
index 2ab8e7cf..4ca3be12 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialCardRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialCardRenderer.cs
@@ -23,17 +23,21 @@ public MaterialCardRenderer(Context context) : base(context)
 
         public bool OnTouch(Android.Views.View v, MotionEvent e)
         {
-            if (_materialCard.GestureRecognizers.Count <= 0 || this.Control.Foreground == null) return false;
+            if (_materialCard.GestureRecognizers.Count <= 0 || Control.Foreground == null)
+            {
+                return false;
+            }
+
             switch (e.Action)
             {
                 case MotionEventActions.Down:
-                    this.Control.Foreground.SetHotspot(e.GetX(), e.GetY());
-                    this.Control.Pressed = true;
+                    Control.Foreground.SetHotspot(e.GetX(), e.GetY());
+                    Control.Pressed = true;
                     break;
                 case MotionEventActions.Up:
                 case MotionEventActions.Cancel:
                 case MotionEventActions.Outside:
-                    this.Control.Pressed = false;
+                    Control.Pressed = false;
                     break;
             }
             return false;
@@ -43,13 +47,17 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
-            _materialCard = this.Element as MaterialCard;
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
+            _materialCard = Element as MaterialCard;
 
-            this.UpdateStrokeColor();
-            this.Control.Elevate(_materialCard.Elevation);
-            this.SetClickable();
-            this.Control.SetOnTouchListener(this);
+            UpdateStrokeColor();
+            Control.Elevate(_materialCard.Elevation);
+            SetClickable();
+            Control.SetOnTouchListener(this);
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -59,13 +67,13 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
             switch (e?.PropertyName)
             {
                 case nameof(MaterialCard.Elevation):
-                    this.Control.Elevate(_materialCard.Elevation);
+                    Control.Elevate(_materialCard.Elevation);
                     break;
                 case nameof(MaterialCard.IsClickable):
-                    this.SetClickable();
+                    SetClickable();
                     break;
                 case nameof(Frame.BackgroundColor):
-                    this.UpdateStrokeColor();
+                    UpdateStrokeColor();
                     break;
             }
         }
@@ -73,22 +81,22 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
         private void SetClickable()
         {
             var clickable = _materialCard.IsClickable;
-            if (clickable && this.Control.Foreground == null)
+            if (clickable && Control.Foreground == null)
             {
                 var outValue = new TypedValue();
-                this.Context.Theme.ResolveAttribute(
+                Context.Theme.ResolveAttribute(
                     Android.Resource.Attribute.SelectableItemBackground, outValue, true);
-                this.Control.Foreground = this.Context.GetDrawable(outValue.ResourceId);
+                Control.Foreground = Context.GetDrawable(outValue.ResourceId);
             }
 
-            this.Control.Focusable = clickable;
-            this.Control.Clickable = clickable;
+            Control.Focusable = clickable;
+            Control.Clickable = clickable;
         }
 
         private void UpdateStrokeColor()
         {
             var borderColor = _materialCard.BorderColor.IsDefault ? _materialCard.BackgroundColor : _materialCard.BorderColor;
-            var drawable = (GradientDrawable)this.Control.Background;
+            var drawable = (GradientDrawable)Control.Background;
             drawable.SetStroke((int)MaterialHelper.ConvertToDp(1), borderColor.ToAndroid());
         }
     }
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialCircularLoadingViewRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialCircularLoadingViewRenderer.cs
index 3966b854..ea010308 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialCircularLoadingViewRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialCircularLoadingViewRenderer.cs
@@ -17,15 +17,22 @@ protected override void OnElementChanged(ElementChangedEventArgs<AnimationView>
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
-            var materialElement = this.Element as MaterialCircularLoadingView;
-            this.Control.SetAnimation(Resource.Raw.loading_animation);
-            this.Control.SetScaleType(scaleType: ScaleType.CenterCrop);
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
+            var materialElement = Element as MaterialCircularLoadingView;
+            Control.SetAnimation(Resource.Raw.loading_animation);
+            Control.SetScaleType(scaleType: ScaleType.CenterCrop);
             if (materialElement != null)
-                this.Control.AddValueCallback(new Com.Airbnb.Lottie.Model.KeyPath("**"), LottieProperty.ColorFilter,
+            {
+                Control.AddValueCallback(new Com.Airbnb.Lottie.Model.KeyPath("**"), LottieProperty.ColorFilter,
                     new Com.Airbnb.Lottie.Value.LottieValueCallback(
                         new PorterDuffColorFilter(materialElement.TintColor.ToAndroid(), PorterDuff.Mode.SrcAtop)));
-            this.Control.PlayAnimation();
+            }
+
+            Control.PlayAnimation();
         }
     }
 }
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialDrawableHelper.cs b/XF.Material/Platforms/Android/Renderers/MaterialDrawableHelper.cs
index 96294b87..2903875a 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialDrawableHelper.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialDrawableHelper.cs
@@ -35,60 +35,60 @@ public MaterialDrawableHelper(IMaterialButtonControl button, Android.Views.View
             _aView = aView;
             _button = button;
             _bindableButton = (BindableObject)_button;
-            _bindableButton.PropertyChanged += this.BindableButton_PropertyChanged;
+            _bindableButton.PropertyChanged += BindableButton_PropertyChanged;
             _propertyChangeActions = new Dictionary<string, Action>
             {
                 { MaterialButtonColorChanged, () =>
                     {
-                        this.UpdateColors();
-                        this.UpdateDrawable();
+                        UpdateColors();
+                        UpdateDrawable();
                     }
                 },
                 { nameof(IMaterialButtonControl.ButtonType), () =>
                     {
-                        this.UpdateColors();
-                        this.UpdateDrawable();
+                        UpdateColors();
+                        UpdateDrawable();
                     }
                 },
                 { nameof(IMaterialButtonControl.BorderColor), () =>
                     {
-                        this.UpdateBorderColor();
-                        this.UpdateDrawable();
+                        UpdateBorderColor();
+                        UpdateDrawable();
                     }
                 },
                 { nameof(IMaterialButtonControl.BorderWidth), () =>
                     {
-                        this.UpdateBorderWidth();
-                        this.UpdateDrawable();
+                        UpdateBorderWidth();
+                        UpdateDrawable();
                     }
                 },
                 { nameof(IMaterialButtonControl.CornerRadius), () =>
                     {
-                        this.UpdateCornerRadius();
-                        this.UpdateDrawable();
+                        UpdateCornerRadius();
+                        UpdateDrawable();
                     }
                 },
-                { nameof(IMaterialButtonControl.Elevation), this.UpdateElevation
+                { nameof(IMaterialButtonControl.Elevation), UpdateElevation
                 },
-                { nameof(VisualElement.IsEnabled), this.UpdateElevation
+                { nameof(VisualElement.IsEnabled), UpdateElevation
                 },
             };
 
-            this.UpdateColors();
-            this.UpdateCornerRadius();
-            this.UpdateBorderWidth();
+            UpdateColors();
+            UpdateCornerRadius();
+            UpdateBorderWidth();
         }
 
         public void Clean()
         {
-            _bindableButton.PropertyChanged -= this.BindableButton_PropertyChanged;
+            _bindableButton.PropertyChanged -= BindableButton_PropertyChanged;
         }
 
         public void UpdateDrawable()
         {
-            _aView.Background = this.GetDrawable();
+            _aView.Background = GetDrawable();
 
-            this.UpdateElevation();
+            UpdateElevation();
         }
 
         public void UpdateHasIcon(bool hasIcon)
@@ -100,7 +100,11 @@ private void BindableButton_PropertyChanged(object sender, System.ComponentModel
         {
             var prop = e?.PropertyName;
 
-            if (prop == null) return;
+            if (prop == null)
+            {
+                return;
+            }
+
             if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(prop, out var handlePropertyChange))
             {
                 handlePropertyChange();
@@ -130,12 +134,12 @@ private GradientDrawable CreateShapeDrawable(float cornerRadius, int borderWidth
 
         private Drawable GetDrawable()
         {
-            var normalStateDrawable = this.CreateShapeDrawable(_cornerRadius, _borderWidth, _normalColor, _enabledBorderColor);
-            var disabledStateDrawable = this.CreateShapeDrawable(_cornerRadius, _borderWidth, _disabledColor, _disabledBorderColor);
+            var normalStateDrawable = CreateShapeDrawable(_cornerRadius, _borderWidth, _normalColor, _enabledBorderColor);
+            var disabledStateDrawable = CreateShapeDrawable(_cornerRadius, _borderWidth, _disabledColor, _disabledBorderColor);
 
             if (Material.IsLollipop)
             {
-                var rippleDrawable = this.GetRippleDrawable();
+                var rippleDrawable = GetRippleDrawable();
                 if (rippleDrawable.FindDrawableByLayerId(Resource.Id.inset_drawable) is InsetDrawable insetDrawable)
                 {
                     var stateListDrawable = insetDrawable.Drawable as StateListDrawable;
@@ -155,7 +159,7 @@ private Drawable GetDrawable()
             }
             else
             {
-                var pressedStateDrawable = this.CreateShapeDrawable(_cornerRadius, _borderWidth, _pressedColor, _enabledBorderColor);
+                var pressedStateDrawable = CreateShapeDrawable(_cornerRadius, _borderWidth, _pressedColor, _enabledBorderColor);
                 StateListDrawable stateListDrawable;
                 Drawable backgroundDrawable;
 
@@ -199,8 +203,14 @@ private RippleDrawable GetRippleDrawable()
             }
 
             if (!(rippleDrawable.FindDrawableByLayerId(Android.Resource.Id.Mask) is InsetDrawable maskDrawable))
+            {
                 return rippleDrawable;
-            if (maskDrawable.Drawable is GradientDrawable rippleMaskGradientDrawable) rippleMaskGradientDrawable.SetCornerRadius(_cornerRadius);
+            }
+
+            if (maskDrawable.Drawable is GradientDrawable rippleMaskGradientDrawable)
+            {
+                rippleMaskGradientDrawable.SetCornerRadius(_cornerRadius);
+            }
 
             return rippleDrawable;
         }
@@ -242,12 +252,16 @@ private void UpdateColors()
         {
             _normalColor = _button.BackgroundColor.ToAndroid();
 
-            this.UpdateDisabledColor(_button.DisabledBackgroundColor);
-            this.UpdatePressedColor(_button.PressedBackgroundColor);
-            this.UpdateBorderColor();
+            UpdateDisabledColor(_button.DisabledBackgroundColor);
+            UpdatePressedColor(_button.PressedBackgroundColor);
+            UpdateBorderColor();
 
             if (_button.ButtonType != MaterialButtonType.Outlined &&
-                _button.ButtonType != MaterialButtonType.Text) return;
+                _button.ButtonType != MaterialButtonType.Text)
+            {
+                return;
+            }
+
             _normalColor = Color.Transparent;
             _disabledColor = Color.Transparent;
             _pressedColor = _button.PressedBackgroundColor.IsDefault ? Color.ParseColor("#52000000") : _button.PressedBackgroundColor.ToAndroid();
@@ -270,12 +284,16 @@ private void UpdateElevation()
                 return;
             }
 
-            _aView.StateListAnimator = this.CreateStateListAnimator();
+            _aView.StateListAnimator = CreateStateListAnimator();
         }
 
         private StateListAnimator CreateStateListAnimator()
         {
-            if (_button.ButtonType != MaterialButtonType.Elevated || !_aView.Enabled) return null;
+            if (_button.ButtonType != MaterialButtonType.Elevated || !_aView.Enabled)
+            {
+                return null;
+            }
+
             var stateListAnimator = new StateListAnimator();
 
             var objAnimTransZEnabled = ObjectAnimator.OfFloat(_aView, "translationZ", MaterialHelper.ConvertToDp(_button.Elevation.RestingElevation))
@@ -305,7 +323,11 @@ private StateListAnimator CreateStateListAnimator()
             stateListAnimator.AddState(new[] { R.Attribute.StateEnabled }, b);
             stateListAnimator.AddState(new[] { R.Attribute.StateFocused }, bb);
 
-            if (!(_aView is AppCompatImageButton)) return stateListAnimator;
+            if (!(_aView is AppCompatImageButton))
+            {
+                return stateListAnimator;
+            }
+
             _aView.OutlineProvider = new MaterialOutlineProvider(_button.CornerRadius);
             _aView.ClipToOutline = false;
 
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialIconRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialIconRenderer.cs
index d7d4403f..0be219c0 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialIconRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialIconRenderer.cs
@@ -20,39 +20,53 @@ protected override void OnElementChanged(ElementChangedEventArgs<Image> e)
         {
             base.OnElementChanged(e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
+
+            if (e?.NewElement == null)
+            {
+                return;
+            }
 
-            if (e?.NewElement == null) return;
-            _materialIcon = this.Element as MaterialIcon;
-            this.UpdateDrawable();
+            _materialIcon = Element as MaterialIcon;
+            UpdateDrawable();
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             base.OnElementPropertyChanged(sender, e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (e?.PropertyName == nameof(MaterialIcon.TintColor) || e?.PropertyName == nameof(Image.Source))
             {
-                this.UpdateDrawable();
+                UpdateDrawable();
             }
         }
 
         private void UpdateDrawable()
         {
-            using (var drawable = this.Control.Drawable.GetDrawableCopy())
+            using (var drawable = Control.Drawable.GetDrawableCopy())
             {
-                this.ChangeTintColor(drawable);
+                ChangeTintColor(drawable);
             }
         }
 
         private void ChangeTintColor(Drawable drawable)
         {
-            if (_materialIcon.TintColor.IsDefault || drawable == null) return;
+            if (_materialIcon.TintColor.IsDefault || drawable == null)
+            {
+                return;
+            }
+
             var tintColor = _materialIcon.TintColor.ToAndroid();
             DrawableCompat.SetTint(drawable, tintColor);
-            this.Control.SetImageDrawable(drawable);
+            Control.SetImageDrawable(drawable);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialLabelRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialLabelRenderer.cs
index deccf6be..6e8d4298 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialLabelRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialLabelRenderer.cs
@@ -20,9 +20,12 @@ protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
+            if (e?.NewElement == null)
+            {
+                return;
+            }
 
-            this.OnLetterSpacingChanged(this.Control, this.Element.LetterSpacing);
+            OnLetterSpacingChanged(Control, Element.LetterSpacing);
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -32,7 +35,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
             switch (e?.PropertyName)
             {
                 case nameof(MaterialLabel.LetterSpacing):
-                    this.OnLetterSpacingChanged(this.Control, this.Element.LetterSpacing);
+                    OnLetterSpacingChanged(Control, Element.LetterSpacing);
                     break;
             }
         }
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialMenuRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialMenuRenderer.cs
index 456d6ba5..049d6d97 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialMenuRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialMenuRenderer.cs
@@ -18,16 +18,16 @@ protected override void OnElementChanged(ElementChangedEventArgs<MaterialMenuBut
 
             if (e?.NewElement != null)
             {
-                this.Element.InternalCommand = new Command(this.OnClick);
+                Element.InternalCommand = new Command(OnClick);
             }
         }
 
         private void OnClick()
         {
-            var displayDensity = this.Context.Resources.DisplayMetrics.Density;
+            var displayDensity = Context.Resources.DisplayMetrics.Density;
             var position = new int[2];
-            this.ViewGroup.GetChildAt(0).GetLocationInWindow(position);
-            this.Element.OnViewTouch(position.ElementAtOrDefault(0) / displayDensity, position.ElementAtOrDefault(1) / displayDensity);
+            ViewGroup.GetChildAt(0).GetLocationInWindow(position);
+            Element.OnViewTouch(position.ElementAtOrDefault(0) / displayDensity, position.ElementAtOrDefault(1) / displayDensity);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Android/Renderers/MaterialNavigationPageRenderer.cs b/XF.Material/Platforms/Android/Renderers/MaterialNavigationPageRenderer.cs
index 5d7fab1c..b9e7c05d 100644
--- a/XF.Material/Platforms/Android/Renderers/MaterialNavigationPageRenderer.cs
+++ b/XF.Material/Platforms/Android/Renderers/MaterialNavigationPageRenderer.cs
@@ -27,19 +27,27 @@ protected override void OnElementChanged(ElementChangedEventArgs<NavigationPage>
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
-            _navigationPage = this.Element as MaterialNavigationPage;
-            _toolbar = this.ViewGroup.GetChildAt(0) as Toolbar;
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
+            _navigationPage = Element as MaterialNavigationPage;
+            _toolbar = ViewGroup.GetChildAt(0) as Toolbar;
         }
 
         protected override Task<bool> OnPopViewAsync(Page page, bool animated)
         {
             var navStack = _navigationPage.Navigation.NavigationStack.ToList();
 
-            if (navStack.Count - 1 - navStack.IndexOf(page) < 0) return base.OnPopViewAsync(page, animated);
+            if (navStack.Count - 1 - navStack.IndexOf(page) < 0)
+            {
+                return base.OnPopViewAsync(page, animated);
+            }
+
             var previousPage = navStack[navStack.IndexOf(page) - 1];
             _navigationPage.InternalPagePop(previousPage, page);
-            this.ChangeHasShadow(previousPage);
+            ChangeHasShadow(previousPage);
 
             return base.OnPopViewAsync(page, animated);
         }
@@ -48,7 +56,7 @@ protected override Task<bool> OnPushAsync(Page view, bool animated)
         {
             _navigationPage.InternalPagePush(view);
 
-            this.ChangeHasShadow(view);
+            ChangeHasShadow(view);
 
             return base.OnPushAsync(view, animated);
         }
@@ -57,7 +65,7 @@ private void ChangeHasShadow(Page page)
         {
             var hasShadow = (bool)page.GetValue(MaterialNavigationPage.HasShadowProperty);
 
-            this.ChangeHasShadow(hasShadow);
+            ChangeHasShadow(hasShadow);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Android/Utilities/MaterialUtility.cs b/XF.Material/Platforms/Android/Utilities/MaterialUtility.cs
index 6cc99dec..b45c607b 100644
--- a/XF.Material/Platforms/Android/Utilities/MaterialUtility.cs
+++ b/XF.Material/Platforms/Android/Utilities/MaterialUtility.cs
@@ -21,7 +21,11 @@ public void ChangeStatusBarColor(Color color)
             var isColorDark = color.ToAndroid().IsColorDark();
             activity.SetStatusBarColor(color.ToAndroid());
 
-            if (Build.VERSION.SdkInt < BuildVersionCodes.M) return;
+            if (Build.VERSION.SdkInt < BuildVersionCodes.M)
+            {
+                return;
+            }
+
             if (!isColorDark)
             {
                 activity.Window.DecorView.SystemUiVisibility = (StatusBarVisibility)SystemUiFlags.LightStatusBar;
diff --git a/XF.Material/Platforms/Ios/Delegates/MaterialRippleGestureRecognizerDelegate.cs b/XF.Material/Platforms/Ios/Delegates/MaterialRippleGestureRecognizerDelegate.cs
index 4893f274..417dc7e2 100644
--- a/XF.Material/Platforms/Ios/Delegates/MaterialRippleGestureRecognizerDelegate.cs
+++ b/XF.Material/Platforms/Ios/Delegates/MaterialRippleGestureRecognizerDelegate.cs
@@ -47,7 +47,7 @@ public override bool ShouldReceiveTouch(UIGestureRecognizer recognizer, UITouch
             _rippleAnimation.To = FromObject(endPath.CGPath);
             view.Layer.InsertSublayer(_rippleLayer, 3);
 
-            this.AnimateRipple();
+            AnimateRipple();
 
             return false;
         }
diff --git a/XF.Material/Platforms/Ios/GestureRecognizers/MaterialRippleGestureRecognizer.cs b/XF.Material/Platforms/Ios/GestureRecognizers/MaterialRippleGestureRecognizer.cs
index 6a3c1fc9..5ef3000d 100644
--- a/XF.Material/Platforms/Ios/GestureRecognizers/MaterialRippleGestureRecognizer.cs
+++ b/XF.Material/Platforms/Ios/GestureRecognizers/MaterialRippleGestureRecognizer.cs
@@ -70,7 +70,7 @@ public MaterialRippleGestureRecognizer(CGColor rippleColor, UIView view)
 
             _isStarted = false;
             _touchView = view;
-            this.Delegate = this;
+            Delegate = this;
         }
 
         [Export("gestureRecognizer:shouldReceiveTouch:")]
@@ -84,14 +84,14 @@ public override void TouchesBegan(NSSet touches, UIEvent evt)
         {
             base.TouchesBegan(touches, evt);
 
-            this.AnimateStart(touches.AnyObject as UITouch);
+            AnimateStart(touches.AnyObject as UITouch);
         }
 
         public override void TouchesEnded(NSSet touches, UIEvent evt)
         {
             base.TouchesEnded(touches, evt);
 
-            this.AnimateComplete();
+            AnimateComplete();
         }
 
 
@@ -99,7 +99,7 @@ public override void TouchesMoved(NSSet touches, UIEvent evt)
         {
             base.TouchesMoved(touches, evt);
 
-            this.AnimateComplete();
+            AnimateComplete();
 
         }
 
@@ -107,15 +107,15 @@ public override void TouchesCancelled(NSSet touches, UIEvent evt)
         {
             base.TouchesCancelled(touches, evt);
 
-            this.AnimateComplete();
+            AnimateComplete();
         }
 
 
 
         private void AnimateStart(UITouch touch)
         {
-            this.AnimateBackgroundFadeIn();
-            this.AnimateRipple(touch);
+            AnimateBackgroundFadeIn();
+            AnimateRipple(touch);
 
             _isStarted = true;
         }
@@ -126,7 +126,7 @@ private void AnimateComplete()
         {
             if (_isStarted)
             {
-                this.AnimateBackgroundFadeOut();
+                AnimateBackgroundFadeOut();
             }
         }
 
@@ -146,7 +146,7 @@ private void AnimateBackgroundFadeIn()
             // animations to ensure that we automatically fade out
             // the background layer after 1.5 seconds.
             //
-            CAAnimationGroup group = new CAAnimationGroup();
+            var group = new CAAnimationGroup();
             group.Duration = 1.7;
             group.RepeatCount = 1;
             group.TimingFunction = CAMediaTimingFunction.FromName(CAMediaTimingFunction.Linear);
diff --git a/XF.Material/Platforms/Ios/Renderers/Internals/MaterialBoxViewRenderer.cs b/XF.Material/Platforms/Ios/Renderers/Internals/MaterialBoxViewRenderer.cs
index bc34e373..5c925729 100644
--- a/XF.Material/Platforms/Ios/Renderers/Internals/MaterialBoxViewRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/Internals/MaterialBoxViewRenderer.cs
@@ -15,7 +15,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<BoxView> e)
 
             if (e?.NewElement != null)
             {
-                this.NativeView?.AddGestureRecognizer(new UIGestureRecognizer() { Delegate = new BoxViewGestureRecognizerDelegate(this.Element as MaterialBoxView) });
+                NativeView?.AddGestureRecognizer(new UIGestureRecognizer() { Delegate = new BoxViewGestureRecognizerDelegate(Element as MaterialBoxView) });
             }
         }
 
diff --git a/XF.Material/Platforms/Ios/Renderers/Internals/MaterialElementRenderer.cs b/XF.Material/Platforms/Ios/Renderers/Internals/MaterialElementRenderer.cs
index 9d9cab07..37fd413b 100644
--- a/XF.Material/Platforms/Ios/Renderers/Internals/MaterialElementRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/Internals/MaterialElementRenderer.cs
@@ -17,12 +17,12 @@ protected override void OnElementChanged(ElementChangedEventArgs<View> e)
 
             if (e?.OldElement != null)
             {
-                (this.Element as IMaterialElementConfiguration)?.ElementChanged(false);
+                (Element as IMaterialElementConfiguration)?.ElementChanged(false);
             }
 
             if (e?.NewElement != null)
             {
-                (this.Element as IMaterialElementConfiguration)?.ElementChanged(true);
+                (Element as IMaterialElementConfiguration)?.ElementChanged(true);
             }
         }
     }
diff --git a/XF.Material/Platforms/Ios/Renderers/Internals/MaterialEntryRenderer.cs b/XF.Material/Platforms/Ios/Renderers/Internals/MaterialEntryRenderer.cs
index 76a229fe..178eb170 100644
--- a/XF.Material/Platforms/Ios/Renderers/Internals/MaterialEntryRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/Internals/MaterialEntryRenderer.cs
@@ -19,40 +19,43 @@ protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
 
             if (e?.NewElement != null)
             {
-                this.SetControl();
+                SetControl();
             }
         }
 
         private void SetControl()
         {
-            if (this.Control == null)
+            if (Control == null)
             {
                 return;
             }
 
-            var heightConstraint = NSLayoutConstraint.Create(this.Control, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1, 20f);
-            this.Control.AddConstraint(heightConstraint);
-            this.Control.BackgroundColor = UIColor.Clear;
-            this.Control.TintColor = (this.Element as MaterialEntry)?.TintColor.ToUIColor();
-            this.Control.BorderStyle = UITextBorderStyle.None;
-            this.Control.TranslatesAutoresizingMaskIntoConstraints = false;
-            this.AddRemoveReturnKeyToNumericInput((this.Element as MaterialEntry).IsNumericKeyboard);
+            var heightConstraint = NSLayoutConstraint.Create(Control, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1, 20f);
+            Control.AddConstraint(heightConstraint);
+            Control.BackgroundColor = UIColor.Clear;
+            Control.TintColor = (Element as MaterialEntry)?.TintColor.ToUIColor();
+            Control.BorderStyle = UITextBorderStyle.None;
+            Control.TranslatesAutoresizingMaskIntoConstraints = false;
+            AddRemoveReturnKeyToNumericInput((Element as MaterialEntry).IsNumericKeyboard);
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             base.OnElementPropertyChanged(sender, e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (e?.PropertyName == nameof(MaterialEntry.TintColor))
             {
-                this.Control.TintColor = (this.Element as MaterialEntry)?.TintColor.ToUIColor();
+                Control.TintColor = (Element as MaterialEntry)?.TintColor.ToUIColor();
             }
 
             if (e?.PropertyName == nameof(MaterialEntry.IsNumericKeyboard))
             {
-                this.AddRemoveReturnKeyToNumericInput((this.Element as MaterialEntry).IsNumericKeyboard);
+                AddRemoveReturnKeyToNumericInput((Element as MaterialEntry).IsNumericKeyboard);
             }
         }
 
@@ -69,7 +72,7 @@ private void AddRemoveReturnKeyToNumericInput(bool isNumeric)
                     var doneButton = new UIBarButtonItem(UIBarButtonSystemItem.Done, delegate
                     {
                         Control.ResignFirstResponder();
-                        this.Element.SendCompleted();
+                        Element.SendCompleted();
                     });
 
                     toolbar.Items = new[] { new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace), doneButton };
@@ -77,12 +80,12 @@ private void AddRemoveReturnKeyToNumericInput(bool isNumeric)
                     _returnButtonAdded = true;
                 }
 
-                this.Control.InputAccessoryView = toolbar;
+                Control.InputAccessoryView = toolbar;
             }
 
             else
             {
-                this.Control.InputAccessoryView = null;
+                Control.InputAccessoryView = null;
             }
 
         }
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialButtonRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialButtonRenderer.cs
index 902a1099..6b732712 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialButtonRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialButtonRenderer.cs
@@ -40,31 +40,34 @@ public override void LayoutSubviews()
         {
             base.LayoutSubviews();
 
-            this.UpdateLayerFrame();
-            this.UpdateCornerRadius();
-            this.UpdateTextSizing();
-            this.UpdateButtonLayer();
-            this.UpdateState();
+            UpdateLayerFrame();
+            UpdateCornerRadius();
+            UpdateTextSizing();
+            UpdateButtonLayer();
+            UpdateState();
         }
 
         protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
         {
             base.OnElementChanged(e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (e?.OldElement != null)
             {
-                this.Control.TouchDown -= this.Control_Pressed;
-                this.Control.TouchDragEnter -= this.Control_Pressed;
-                this.Control.TouchUpInside -= this.Control_Released;
-                this.Control.TouchCancel -= this.Control_Released;
-                this.Control.TouchDragExit -= this.Control_Released;
+                Control.TouchDown -= Control_Pressed;
+                Control.TouchDragEnter -= Control_Pressed;
+                Control.TouchUpInside -= Control_Released;
+                Control.TouchCancel -= Control_Released;
+                Control.TouchDragExit -= Control_Released;
             }
 
             if (e?.NewElement != null)
             {
-                _materialButton = this.Element as MaterialButton;
+                _materialButton = Element as MaterialButton;
 
                 if (_materialButton != null)
                 {
@@ -76,18 +79,18 @@ protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
                     }
                 }
 
-                this.SetupIcon();
-                this.SetupColors();
-                this.UpdateText();
-                this.CreateStateAnimations();
-                this.UpdateButtonLayer();
-                this.UpdateState();
-                this.UpdateTextColor();
-                this.Control.TouchDown += this.Control_Pressed;
-                this.Control.TouchDragEnter += this.Control_Pressed;
-                this.Control.TouchUpInside += this.Control_Released;
-                this.Control.TouchCancel += this.Control_Released;
-                this.Control.TouchDragExit += this.Control_Released;
+                SetupIcon();
+                SetupColors();
+                UpdateText();
+                CreateStateAnimations();
+                UpdateButtonLayer();
+                UpdateState();
+                UpdateTextColor();
+                Control.TouchDown += Control_Pressed;
+                Control.TouchDragEnter += Control_Pressed;
+                Control.TouchUpInside += Control_Released;
+                Control.TouchCancel += Control_Released;
+                Control.TouchDragExit += Control_Released;
             }
         }
 
@@ -95,26 +98,29 @@ protected override async void OnElementPropertyChanged(object sender, PropertyCh
         {
             base.OnElementPropertyChanged(sender, e);
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (e.PropertyName == nameof(Button.IsEnabled))
             {
-                this.UpdateState();
+                UpdateState();
             }
 
             switch (e.PropertyName)
             {
                 case MaterialButton.MaterialButtonColorChanged:
                 case nameof(MaterialButton.ButtonType):
-                    this.SetupColors();
-                    this.CreateStateAnimations();
-                    this.UpdateButtonLayer();
-                    await this.UpdateBackgroundColor();
+                    SetupColors();
+                    CreateStateAnimations();
+                    UpdateButtonLayer();
+                    await UpdateBackgroundColor();
                     break;
 
                 case nameof(MaterialButton.Image):
-                    this.SetupIcon();
-                    this.UpdateButtonLayer();
+                    SetupIcon();
+                    UpdateButtonLayer();
                     break;
 
                 case nameof(MaterialButton.AllCaps):
@@ -122,24 +128,24 @@ protected override async void OnElementPropertyChanged(object sender, PropertyCh
                     break;
 
                 case nameof(MaterialButton.CornerRadius):
-                    this.UpdateCornerRadius();
+                    UpdateCornerRadius();
                     break;
 
                 case nameof(MaterialButton.LetterSpacing):
-                    this.UpdateText();
+                    UpdateText();
                     break;
 
                 case nameof(MaterialButton.Text):
-                    this.UpdateText();
-                    this.UpdateTextSizing();
+                    UpdateText();
+                    UpdateTextSizing();
                     break;
 
                 case nameof(MaterialButton.Padding):
-                    this.UpdatePadding();
+                    UpdatePadding();
                     break;
 
                 case nameof(MaterialButton.TextColor):
-                    this.UpdateTextColor();
+                    UpdateTextColor();
                     break;
             }
         }
@@ -150,8 +156,8 @@ private async void Control_Pressed(object sender, EventArgs e)
             {
                 await AnimateAsync(0.150, () =>
                 {
-                    this.Control.Layer.AddAnimation(_shadowOffsetPressed, "shadowOffsetPressed");
-                    this.Control.Layer.AddAnimation(_shadowRadiusPressed, "shadowRadiusPressed");
+                    Control.Layer.AddAnimation(_shadowOffsetPressed, "shadowOffsetPressed");
+                    Control.Layer.AddAnimation(_shadowRadiusPressed, "shadowRadiusPressed");
                     _animationLayer.AddAnimation(_colorPressed, "backgroundColorPressed");
                 });
             }
@@ -168,16 +174,16 @@ private async void Control_Released(object sender, EventArgs e)
 
             if (_materialButton.ButtonType == MaterialButtonType.Elevated)
             {
-                var shadowOffsetAnim = this.Control.Layer.AnimationForKey("shadowOffsetPressed");
+                var shadowOffsetAnim = Control.Layer.AnimationForKey("shadowOffsetPressed");
                 _shadowOffsetResting.From = shadowOffsetAnim.ValueForKeyPath(new NSString("shadowOffset"));
 
-                var shadowRadiusAnim = this.Control.Layer.AnimationForKey("shadowRadiusPressed");
+                var shadowRadiusAnim = Control.Layer.AnimationForKey("shadowRadiusPressed");
                 _shadowRadiusResting.From = shadowRadiusAnim.ValueForKeyPath(new NSString("shadowRadius"));
 
                 await AnimateAsync(0.150, () =>
                 {
-                    this.Control.Layer.AddAnimation(_shadowOffsetResting, "shadowOffsetResting");
-                    this.Control.Layer.AddAnimation(_shadowRadiusResting, "shadowRadiusResting");
+                    Control.Layer.AddAnimation(_shadowOffsetResting, "shadowOffsetResting");
+                    Control.Layer.AddAnimation(_shadowRadiusResting, "shadowRadiusResting");
                     _animationLayer.AddAnimation(_colorResting, "backgroundColorResting");
                 });
             }
@@ -195,7 +201,7 @@ private void CreateContainedButtonLayer(bool elevated)
 
             if (elevated)
             {
-                this.Control.Elevate(_materialButton.Elevation.RestingElevation);
+                Control.Elevate(_materialButton.Elevation.RestingElevation);
             }
         }
 
@@ -250,7 +256,7 @@ private void CreateStateAnimations()
             if (_rippleGestureRecognizer == null)
             {
                 _rippleGestureRecognizer = new UITapGestureRecognizer() { Delegate = new MaterialRippleGestureRecognizerDelegate(_rippleColor.CGColor) };
-                this.Control.AddGestureRecognizer(_rippleGestureRecognizer);
+                Control.AddGestureRecognizer(_rippleGestureRecognizer);
             }
         }
 
@@ -309,12 +315,12 @@ private void SetupIcon()
                     {
                         UIGraphics.EndImageContext();
 
-                        this.Control.SetImage(newImage, UIControlState.Normal);
-                        this.Control.SetImage(newImage, UIControlState.Disabled);
+                        Control.SetImage(newImage, UIControlState.Normal);
+                        Control.SetImage(newImage, UIControlState.Disabled);
 
-                        this.Control.HorizontalAlignment = UIControlContentHorizontalAlignment.Left;
-                        this.Control.ImageEdgeInsets = new UIEdgeInsets(0f, 0f, 0f, 0f);
-                        this.Control.TintColor = _materialButton.TextColor.ToUIColor();
+                        Control.HorizontalAlignment = UIControlContentHorizontalAlignment.Left;
+                        Control.ImageEdgeInsets = new UIEdgeInsets(0f, 0f, 0f, 0f);
+                        Control.TintColor = _materialButton.TextColor.ToUIColor();
                     }
                 }
                 finally
@@ -324,8 +330,8 @@ private void SetupIcon()
             }
             else
             {
-                this.Control.TitleEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
-                this.Control.HorizontalAlignment = UIControlContentHorizontalAlignment.Center;
+                Control.TitleEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
+                Control.HorizontalAlignment = UIControlContentHorizontalAlignment.Center;
             }
         }
 
@@ -342,45 +348,51 @@ private Task<bool> UpdateBackgroundColor()
 
         private void UpdateButtonLayer()
         {
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (_animationLayer == null)
             {
                 _animationLayer = new CALayer();
-                this.Control.Layer.InsertSublayer(_animationLayer, 0);
+                Control.Layer.InsertSublayer(_animationLayer, 0);
             }
 
             switch (_materialButton.ButtonType)
             {
                 case MaterialButtonType.Elevated:
-                    this.CreateContainedButtonLayer(true);
+                    CreateContainedButtonLayer(true);
                     break;
 
                 case MaterialButtonType.Flat:
-                    this.CreateContainedButtonLayer(false);
+                    CreateContainedButtonLayer(false);
                     break;
 
                 case MaterialButtonType.Outlined:
-                    this.CreateOutlinedButtonLayer();
+                    CreateOutlinedButtonLayer();
                     break;
 
                 case MaterialButtonType.Text:
-                    this.CreateTextButtonLayer();
+                    CreateTextButtonLayer();
                     break;
             }
 
-            this.UpdatePadding();
+            UpdatePadding();
         }
 
         private void UpdatePadding()
         {
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
-            var additionalPadding = this.Element.Padding;
+            var additionalPadding = Element.Padding;
 
             if (_materialButton.ButtonType != MaterialButtonType.Text && _withIcon)
             {
-                this.Control.ContentEdgeInsets = new UIEdgeInsets(
+                Control.ContentEdgeInsets = new UIEdgeInsets(
                     10f + (nfloat)additionalPadding.Top,
                     18f + (nfloat)additionalPadding.Left,
                     10f + (nfloat)additionalPadding.Bottom,
@@ -388,7 +400,7 @@ private void UpdatePadding()
             }
             else if (_materialButton.ButtonType != MaterialButtonType.Text && !_withIcon)
             {
-                this.Control.ContentEdgeInsets = new UIEdgeInsets(
+                Control.ContentEdgeInsets = new UIEdgeInsets(
                     10f + (nfloat)additionalPadding.Top,
                     22f + (nfloat)additionalPadding.Left,
                     10f + (nfloat)additionalPadding.Bottom,
@@ -396,7 +408,7 @@ private void UpdatePadding()
             }
             else if (_materialButton.ButtonType is MaterialButtonType.Text && _withIcon)
             {
-                this.Control.ContentEdgeInsets = new UIEdgeInsets(
+                Control.ContentEdgeInsets = new UIEdgeInsets(
                     10f + (nfloat)additionalPadding.Top,
                     18f + (nfloat)additionalPadding.Left,
                     10f + (nfloat)additionalPadding.Bottom,
@@ -404,7 +416,7 @@ private void UpdatePadding()
             }
             else if (_materialButton.ButtonType is MaterialButtonType.Text && !_withIcon)
             {
-                this.Control.ContentEdgeInsets = new UIEdgeInsets(
+                Control.ContentEdgeInsets = new UIEdgeInsets(
                     10f + (nfloat)additionalPadding.Top,
                     14f + (nfloat)additionalPadding.Left,
                     10f + (nfloat)additionalPadding.Bottom,
@@ -414,7 +426,7 @@ private void UpdatePadding()
 
         private void UpdateCornerRadius()
         {
-            if (this.Control == null || _animationLayer == null)
+            if (Control == null || _animationLayer == null)
             {
                 return;
             }
@@ -423,25 +435,31 @@ private void UpdateCornerRadius()
             var preferredCornerRadius = _materialButton.CornerRadius > maxCornerRadius ? maxCornerRadius : _materialButton.CornerRadius;
 
             _animationLayer.CornerRadius = Convert.ToInt32(preferredCornerRadius);
-            this.Control.Layer.CornerRadius = _animationLayer.CornerRadius;
+            Control.Layer.CornerRadius = _animationLayer.CornerRadius;
         }
 
         private void UpdateLayerFrame()
         {
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
-            var width = this.Control.Frame.Width - 12;
-            var height = this.Control.Frame.Height - 12;
+            var width = Control.Frame.Width - 12;
+            var height = Control.Frame.Height - 12;
 
             _animationLayer.Frame = new CGRect(6, 6, width, height);
 
-            this.Control.Layer.BackgroundColor = UIColor.Clear.CGColor;
-            this.Control.Layer.BorderColor = UIColor.Clear.CGColor;
+            Control.Layer.BackgroundColor = UIColor.Clear.CGColor;
+            Control.Layer.BorderColor = UIColor.Clear.CGColor;
         }
 
         private void UpdateState()
         {
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (_materialButton.IsEnabled)
             {
@@ -450,7 +468,7 @@ private void UpdateState()
 
                 if (_materialButton.ButtonType == MaterialButtonType.Elevated)
                 {
-                    this.Control.Elevate(_materialButton.Elevation.RestingElevation);
+                    Control.Elevate(_materialButton.Elevation.RestingElevation);
                 }
 
                 switch (_materialButton.ButtonType)
@@ -462,7 +480,7 @@ private void UpdateState()
 
                     case MaterialButtonType.Text:
                     case MaterialButtonType.Outlined:
-                        this.Control.Alpha = 1f;
+                        Control.Alpha = 1f;
                         break;
                 }
             }
@@ -473,7 +491,7 @@ private void UpdateState()
 
                 if (_materialButton.ButtonType == MaterialButtonType.Elevated)
                 {
-                    this.Control.Elevate(0);
+                    Control.Elevate(0);
                 }
 
                 switch (_materialButton.ButtonType)
@@ -485,7 +503,7 @@ private void UpdateState()
 
                     case MaterialButtonType.Text:
                     case MaterialButtonType.Outlined:
-                        this.Control.Alpha = 0.38f;
+                        Control.Alpha = 0.38f;
                         break;
                 }
             }
@@ -493,26 +511,32 @@ private void UpdateState()
 
         private void UpdateText()
         {
-            if (this.Control == null || this.Control.TitleLabel.AttributedText == null) return;
+            if (Control == null || Control.TitleLabel.AttributedText == null)
+            {
+                return;
+            }
 
-            var text = this.Element.Text;
+            var text = Element.Text;
             text = _materialButton.AllCaps ? text?.ToUpper() : text;
-            this.Control.TitleLabel.Text = text;
+            Control.TitleLabel.Text = text;
 
             var range = new NSRange(0, text?.Length ?? 0);
-            var newAttr = new NSMutableAttributedString(this.Control.TitleLabel.AttributedText);
+            var newAttr = new NSMutableAttributedString(Control.TitleLabel.AttributedText);
             newAttr.AddAttribute(UIStringAttributeKey.KerningAdjustment, FromObject((float)_materialButton.LetterSpacing), range);
 
-            this.Control.SetAttributedTitle(newAttr, UIControlState.Normal);
+            Control.SetAttributedTitle(newAttr, UIControlState.Normal);
         }
 
         private void UpdateTextSizing()
         {
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
             if (string.IsNullOrEmpty(_materialButton.Text) || !_withIcon)
             {
-                this.Control.TitleEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
+                Control.TitleEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
                 return;
             }
 
@@ -522,24 +546,27 @@ private void UpdateTextSizing()
             var textToMeasure = (NSString)(_materialButton.Text ?? "");
 
             var labelRect = textToMeasure.GetBoundingRect(
-                new CGSize(this.Frame.Width - 40, nfloat.MaxValue),
+                new CGSize(Frame.Width - 40, nfloat.MaxValue),
                 NSStringDrawingOptions.UsesLineFragmentOrigin,
-                new UIStringAttributes() { Font = this.Control.Font },
+                new UIStringAttributes() { Font = Control.Font },
                 new NSStringDrawingContext()
             );
 
             var textWidth = (float)labelRect.Size.Width;
-            var buttonWidth = (float)this.Control.Frame.Width;
+            var buttonWidth = (float)Control.Frame.Width;
 
             var inset = ((buttonWidth - textWidth) / 2) - 28;
-            this.Control.TitleEdgeInsets = new UIEdgeInsets(0, inset, 0, -40);
+            Control.TitleEdgeInsets = new UIEdgeInsets(0, inset, 0, -40);
         }
 
         private void UpdateTextColor()
         {
-            if (this.Control == null || this.Control.CurrentAttributedTitle == null) return;
+            if (Control == null || Control.CurrentAttributedTitle == null)
+            {
+                return;
+            }
 
-            var title = new NSMutableAttributedString(this.Control.CurrentAttributedTitle);
+            var title = new NSMutableAttributedString(Control.CurrentAttributedTitle);
 
             title.EnumerateAttributes(new NSRange(0, title.Length), NSAttributedStringEnumeration.None,
                 (NSDictionary attrs, NSRange range, ref bool stop) =>
@@ -549,9 +576,9 @@ private void UpdateTextColor()
                     title.EndEditing();
                 });
 
-            this.Control.SetAttributedTitle(title, UIControlState.Normal);
-            this.Control.SetAttributedTitle(title, UIControlState.Highlighted);
-            this.Control.SetAttributedTitle(title, UIControlState.Disabled);
+            Control.SetAttributedTitle(title, UIControlState.Normal);
+            Control.SetAttributedTitle(title, UIControlState.Highlighted);
+            Control.SetAttributedTitle(title, UIControlState.Disabled);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialCardRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialCardRenderer.cs
index e36f2b56..7c852280 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialCardRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialCardRenderer.cs
@@ -20,12 +20,19 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
-            _materialCard = this.Element as MaterialCard;
-            if (_materialCard != null) this.Elevate(_materialCard.Elevation);
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
+            _materialCard = Element as MaterialCard;
+            if (_materialCard != null)
+            {
+                this.Elevate(_materialCard.Elevation);
+            }
 
-            this.SetupColors();
-            this.SetIsClickable();
+            SetupColors();
+            SetIsClickable();
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -43,19 +50,19 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
                 // color is modified. So this fixes it.
                 //
                 case nameof(MaterialCard.BackgroundColor):
-                    this.SetupColors();
-                    this.SetIsClickable();
+                    SetupColors();
+                    SetIsClickable();
                     this.Elevate(_materialCard.Elevation);
                     break;
                 case nameof(MaterialCard.IsClickable):
-                    this.SetIsClickable();
+                    SetIsClickable();
                     break;
             }
         }
 
         private void SetupColors()
         {
-            _rippleColor = this.BackgroundColor.IsColorDark() ? Color.FromHex("#52FFFFFF").ToUIColor() : Color.FromHex("#52000000").ToUIColor();
+            _rippleColor = BackgroundColor.IsColorDark() ? Color.FromHex("#52FFFFFF").ToUIColor() : Color.FromHex("#52000000").ToUIColor();
         }
 
         private void SetIsClickable()
@@ -68,13 +75,15 @@ private void SetIsClickable()
                     _rippleGestureRecognizerDelegate = new MaterialRippleGestureRecognizer(_rippleColor.CGColor, this);
                 }
                 else
-                    this.RemoveGestureRecognizer(_rippleGestureRecognizerDelegate);
+                {
+                    RemoveGestureRecognizer(_rippleGestureRecognizerDelegate);
+                }
 
-                this.AddGestureRecognizer(_rippleGestureRecognizerDelegate);
+                AddGestureRecognizer(_rippleGestureRecognizerDelegate);
             }
             else if (_rippleGestureRecognizerDelegate != null)
             {
-                this.RemoveGestureRecognizer(_rippleGestureRecognizerDelegate);
+                RemoveGestureRecognizer(_rippleGestureRecognizerDelegate);
             }
         }
     }
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialCircularLoadingViewRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialCircularLoadingViewRenderer.cs
index adfc0fb8..1e233370 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialCircularLoadingViewRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialCircularLoadingViewRenderer.cs
@@ -18,27 +18,44 @@ protected override void OnElementChanged(ElementChangedEventArgs<AnimationView>
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null) return;
+            if (e?.NewElement == null)
+            {
+                return;
+            }
+
             _materialElement = e?.NewElement as MaterialCircularLoadingView;
-            if (_materialElement != null) _materialElement.Animation = "loading_animation.json";
+            if (_materialElement != null)
+            {
+                _materialElement.Animation = "loading_animation.json";
+            }
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
-            this.Control.ContentMode = UIViewContentMode.ScaleAspectFill;
+            Control.ContentMode = UIViewContentMode.ScaleAspectFill;
         }
 
         public override void LayoutSubviews()
         {
             base.LayoutSubviews();
 
-            if (_valueCallback != null) return;
+            if (_valueCallback != null)
+            {
+                return;
+            }
+
             _valueCallback = LOTColorValueCallback.WithCGColor(_materialElement.TintColor.ToCGColor());
             var keyPath = LOTKeypath.KeypathWithString("Shape Layer 1 Comp 1.Shape Layer 1.Ellipse 1.Stroke 1.Color");
 
-            if (this.Control == null) return;
+            if (Control == null)
+            {
+                return;
+            }
 
-            this.Control.SetValueDelegate(_valueCallback, keyPath);
-            this.Control.Play();
+            Control.SetValueDelegate(_valueCallback, keyPath);
+            Control.Play();
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialIconRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialIconRenderer.cs
index 8917e0c5..ae7d4b20 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialIconRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialIconRenderer.cs
@@ -17,26 +17,38 @@ protected override void OnElementChanged(ElementChangedEventArgs<Image> e)
         {
             base.OnElementChanged(e);
 
-            if (e?.NewElement == null || this.Control == null) return;
-            _materialIcon = this.Element as MaterialIcon;
-            _image = this.Control.Image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
-            this.ChangeTintColor();
+            if (e?.NewElement == null || Control == null)
+            {
+                return;
+            }
+
+            _materialIcon = Element as MaterialIcon;
+            _image = Control.Image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
+            ChangeTintColor();
         }
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             base.OnElementPropertyChanged(sender, e);
 
-            if (e?.PropertyName != nameof(MaterialIcon.TintColor) && e?.PropertyName != nameof(Image.Source) || this.Control == null) return;
-            _image = this.Control.Image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
-            this.ChangeTintColor();
+            if (e?.PropertyName != nameof(MaterialIcon.TintColor) && e?.PropertyName != nameof(Image.Source) || Control == null)
+            {
+                return;
+            }
+
+            _image = Control.Image?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
+            ChangeTintColor();
         }
 
         private void ChangeTintColor()
         {
-            if (_materialIcon.TintColor.IsDefault || _image == null || this.Control == null) return;
-            this.Control.TintColor = _materialIcon.TintColor.ToUIColor();
-            this.Control.Image = _image;
+            if (_materialIcon.TintColor.IsDefault || _image == null || Control == null)
+            {
+                return;
+            }
+
+            Control.TintColor = _materialIcon.TintColor.ToUIColor();
+            Control.Image = _image;
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialLabelRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialLabelRenderer.cs
index c56a8d21..73f6b6f3 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialLabelRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialLabelRenderer.cs
@@ -16,38 +16,41 @@ public class MaterialLabelRenderer : LabelRenderer
     {
         public new MaterialLabel Element => base.Element as MaterialLabel;
 
-        public NSMutableAttributedString AttributedString => this.Control?.AttributedText as NSMutableAttributedString;
+        public NSMutableAttributedString AttributedString => Control?.AttributedText as NSMutableAttributedString;
 
         public override void LayoutSubviews()
         {
             base.LayoutSubviews();
 
-            this.CheckIfSingleLine();
-            this.UpdateLetterSpacing(this.Control, this.Element.LetterSpacing);
+            CheckIfSingleLine();
+            UpdateLetterSpacing(Control, Element.LetterSpacing);
             EnsureLineBreakMode();
         }
 
         private void CheckIfSingleLine()
         {
-            if (this.Control == null || this.Control.Frame.Size.Height == 0)
+            if (Control == null || Control.Frame.Size.Height == 0)
             {
                 return;
             }
 
-            var textSize = new CGSize(this.Control.Frame.Size.Width, nfloat.MaxValue);
-            var rHeight = this.Control.SizeThatFits(textSize).Height;
-            var charSize = this.Control.Font.LineHeight;
+            var textSize = new CGSize(Control.Frame.Size.Width, nfloat.MaxValue);
+            var rHeight = Control.SizeThatFits(textSize).Height;
+            var charSize = Control.Font.LineHeight;
             var lines = Convert.ToInt32(rHeight / charSize);
 
             if (lines == 1)
             {
-                this.Element.LineHeight = 1;
+                Element.LineHeight = 1;
             }
         }
         private void EnsureLineBreakMode()
         {
             if (Element == null || Control == null)
+            {
                 return;
+            }
+
             var lbm = Element.LineBreakMode;
             switch (lbm)
             {
@@ -80,7 +83,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
 
             if (e?.NewElement != null)
             {
-                this.UpdateLetterSpacing(this.Control, this.Element.LetterSpacing);
+                UpdateLetterSpacing(Control, Element.LetterSpacing);
                 EnsureLineBreakMode();
             }
         }
@@ -93,8 +96,8 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
             {
                 case nameof(MaterialLabel.LetterSpacing):
                 case nameof(Label.Text):
-                    UpdateLetterSpacing(this.Control, this.Element.LetterSpacing);
-                    this.CheckIfSingleLine();
+                    UpdateLetterSpacing(Control, Element.LetterSpacing);
+                    CheckIfSingleLine();
                     EnsureLineBreakMode();
                     break;
             }
@@ -102,13 +105,16 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
         private void UpdateLetterSpacing(UILabel uiLabel, double letterSpacing)
         {
-            if (uiLabel == null || this.AttributedString == null) return;
+            if (uiLabel == null || AttributedString == null)
+            {
+                return;
+            }
 
             var range = new NSRange(0, uiLabel.Text?.Length ?? 0);
-            var attr = new NSMutableAttributedString(this.Control.AttributedText);
+            var attr = new NSMutableAttributedString(Control.AttributedText);
             attr.AddAttribute(UIStringAttributeKey.KerningAdjustment, FromObject((float)letterSpacing), range);
 
-            this.Control.AttributedText = attr;
+            Control.AttributedText = attr;
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialMenuRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialMenuRenderer.cs
index ab05b242..1aca5b1e 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialMenuRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialMenuRenderer.cs
@@ -15,20 +15,20 @@ protected override void OnElementChanged(ElementChangedEventArgs<MaterialMenuBut
 
             if (e?.NewElement != null)
             {
-                this.Element.InternalCommand = new Command(this.OnClick);
+                Element.InternalCommand = new Command(OnClick);
             }
         }
 
         private void OnClick()
         {
-            var globalLocation = this.ConvertPointToView(this.GetContentRenderer().Frame.Location, null);
+            var globalLocation = ConvertPointToView(GetContentRenderer().Frame.Location, null);
 
-            this.Element.OnViewTouch(globalLocation.X, globalLocation.Y);
+            Element.OnViewTouch(globalLocation.X, globalLocation.Y);
         }
 
         private UIView GetContentRenderer()
         {
-            return Platform.GetRenderer(this.Element?.Content).NativeView;
+            return Platform.GetRenderer(Element?.Content).NativeView;
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Ios/Renderers/MaterialNavigationPageRenderer.cs b/XF.Material/Platforms/Ios/Renderers/MaterialNavigationPageRenderer.cs
index 278e6d66..c1bae0d4 100644
--- a/XF.Material/Platforms/Ios/Renderers/MaterialNavigationPageRenderer.cs
+++ b/XF.Material/Platforms/Ios/Renderers/MaterialNavigationPageRenderer.cs
@@ -17,24 +17,27 @@ public class MaterialNavigationPageRenderer : NavigationRenderer
 
         private void ChangeHasShadow(bool hasShadow)
         {
-            if (this.NavigationBar == null || this.NavigationBar.Layer == null) return;
+            if (NavigationBar == null || NavigationBar.Layer == null)
+            {
+                return;
+            }
 
             if (hasShadow)
             {
-                this.NavigationBar.Layer.MasksToBounds = false;
-                this.NavigationBar.Layer.ShadowColor = UIColor.Black.CGColor;
-                this.NavigationBar.Layer.ShadowOffset = new CGSize(0, 3f);
-                this.NavigationBar.Layer.ShadowOpacity = 0.32f;
-                this.NavigationBar.Layer.ShadowRadius = 3f;
+                NavigationBar.Layer.MasksToBounds = false;
+                NavigationBar.Layer.ShadowColor = UIColor.Black.CGColor;
+                NavigationBar.Layer.ShadowOffset = new CGSize(0, 3f);
+                NavigationBar.Layer.ShadowOpacity = 0.32f;
+                NavigationBar.Layer.ShadowRadius = 3f;
             }
 
             else
             {
-                this.NavigationBar.Layer.MasksToBounds = false;
-                this.NavigationBar.Layer.ShadowColor = UIColor.Black.CGColor;
-                this.NavigationBar.Layer.ShadowOffset = new CGSize(0f, 0f);
-                this.NavigationBar.Layer.ShadowOpacity = 0f;
-                this.NavigationBar.Layer.ShadowRadius = 0f;
+                NavigationBar.Layer.MasksToBounds = false;
+                NavigationBar.Layer.ShadowColor = UIColor.Black.CGColor;
+                NavigationBar.Layer.ShadowOffset = new CGSize(0f, 0f);
+                NavigationBar.Layer.ShadowOpacity = 0f;
+                NavigationBar.Layer.ShadowRadius = 0f;
             }
         }
 
@@ -44,7 +47,7 @@ protected override void OnElementChanged(VisualElementChangedEventArgs e)
 
             if (e?.NewElement != null)
             {
-                _navigationPage = this.Element as MaterialNavigationPage;
+                _navigationPage = Element as MaterialNavigationPage;
             }
         }
 
@@ -53,10 +56,14 @@ protected override Task<bool> OnPopViewAsync(Page page, bool animated)
             var pop = base.OnPopViewAsync(page, animated);
             var navStack = _navigationPage.Navigation.NavigationStack.ToList();
 
-            if (navStack.Count - 1 - navStack.IndexOf(_navigationPage.CurrentPage) < 0) return pop;
+            if (navStack.Count - 1 - navStack.IndexOf(_navigationPage.CurrentPage) < 0)
+            {
+                return pop;
+            }
+
             var previousPage = navStack[navStack.IndexOf(_navigationPage.CurrentPage) - 1];
             _navigationPage.InternalPagePop(previousPage, page);
-            this.ChangeHasShadow(previousPage);
+            ChangeHasShadow(previousPage);
 
             return pop;
         }
@@ -65,7 +72,7 @@ protected override Task<bool> OnPushAsync(Page page, bool animated)
         {
             _navigationPage.InternalPagePush(page);
 
-            this.ChangeHasShadow(page);
+            ChangeHasShadow(page);
 
             return base.OnPushAsync(page, animated);
         }
@@ -74,7 +81,7 @@ private void ChangeHasShadow(Page page)
         {
             var hasShadow = (bool)page.GetValue(MaterialNavigationPage.HasShadowProperty);
 
-            this.ChangeHasShadow(hasShadow);
+            ChangeHasShadow(hasShadow);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Ios/Utility/MaterialUtility.cs b/XF.Material/Platforms/Ios/Utility/MaterialUtility.cs
index 9b009166..723f860b 100644
--- a/XF.Material/Platforms/Ios/Utility/MaterialUtility.cs
+++ b/XF.Material/Platforms/Ios/Utility/MaterialUtility.cs
@@ -1,5 +1,4 @@
-using System;
-using Foundation;
+using Foundation;
 using UIKit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
@@ -23,7 +22,7 @@ public void ChangeStatusBarColor(Color color)
             UIView statusBar = null;
             if (UIDevice.CurrentDevice.CheckSystemVersion(13, 0))
             {
-                nint tag = (System.nint)38482458385;
+                var tag = (System.nint)38482458385;
                 statusBar = UIApplication.SharedApplication.KeyWindow?.ViewWithTag(tag);
                 if (statusBar == null)
                 {
@@ -33,10 +32,14 @@ public void ChangeStatusBarColor(Color color)
                 }
             }
             else
+            {
                 statusBar = UIApplication.SharedApplication.ValueForKey(new NSString("statusBar")) as UIView;
+            }
 
             if (statusBar != null)
+            {
                 statusBar.BackgroundColor = color.ToUIColor();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/Platforms/Uap/Renderers/DropShadowViewRenderer.cs b/XF.Material/Platforms/Uap/Renderers/DropShadowViewRenderer.cs
index c57b3876..037fe215 100644
--- a/XF.Material/Platforms/Uap/Renderers/DropShadowViewRenderer.cs
+++ b/XF.Material/Platforms/Uap/Renderers/DropShadowViewRenderer.cs
@@ -22,7 +22,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<DropShadowView>
 
             if (e?.OldElement != null)
             {
-                this.ParentView.SizeChanged -= this.Element_SizeChanged;
+                ParentView.SizeChanged -= Element_SizeChanged;
             }
             if (e?.NewElement != null)
             {
@@ -34,17 +34,17 @@ protected override void OnElementChanged(ElementChangedEventArgs<DropShadowView>
 
                 _rectangle = new Rectangle();
 
-                this.Control.Content = _rectangle;
+                Control.Content = _rectangle;
 
                 UpdateSurfaceColor();
                 UpdateCornerRadius();
                 UpdateElevation();
 
-                this.ParentView.SizeChanged += this.Element_SizeChanged;
+                ParentView.SizeChanged += Element_SizeChanged;
             }
         }
 
-        private View ParentView => this.Element.Parent as View;
+        private View ParentView => Element.Parent as View;
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
@@ -58,29 +58,29 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
         private void Element_SizeChanged(object sender, EventArgs e)
         {
-            if (this.ParentView.Width * this.ParentView.Height > 0)
+            if (ParentView.Width * ParentView.Height > 0)
             {
-                _rectangle.Width = this.ParentView.Width;
-                _rectangle.Height = this.ParentView.Height;
+                _rectangle.Width = ParentView.Width;
+                _rectangle.Height = ParentView.Height;
             }
         }
 
         private void UpdateCornerRadius()
         {
-            _rectangle.RadiusX = this.Element.CornerRadius;
-            _rectangle.RadiusY = this.Element.CornerRadius;
+            _rectangle.RadiusX = Element.CornerRadius;
+            _rectangle.RadiusY = Element.CornerRadius;
         }
 
         private void UpdateSurfaceColor()
         {
-            _rectangle.Fill = new SolidColorBrush(this.Element.SurfaceColor.ToWindowsColor());
+            _rectangle.Fill = new SolidColorBrush(Element.SurfaceColor.ToWindowsColor());
         }
 
         private void UpdateElevation()
         {
-            this.Control.OffsetY = this.Element.OffsetY;
-            this.Control.OffsetX = this.Element.OffsetX;
-            this.Control.BlurRadius = this.Element.BlurRadius;
+            Control.OffsetY = Element.OffsetY;
+            Control.OffsetX = Element.OffsetX;
+            Control.BlurRadius = Element.BlurRadius;
         }
     }
 }
diff --git a/XF.Material/UI/CardView.xaml.cs b/XF.Material/UI/CardView.xaml.cs
index 53fe827a..764c4e65 100644
--- a/XF.Material/UI/CardView.xaml.cs
+++ b/XF.Material/UI/CardView.xaml.cs
@@ -75,49 +75,49 @@ public CardView()
         {
             InitializeComponent();
 
-            dropShadow.CornerRadius = this.CornerRadius;
-            dropShadow.OffsetX = this.OffsetX;
-            dropShadow.OffsetY = this.OffsetY;
-            dropShadow.BlurRadius = this.BlurRadius;
+            dropShadow.CornerRadius = CornerRadius;
+            dropShadow.OffsetX = OffsetX;
+            dropShadow.OffsetY = OffsetY;
+            dropShadow.BlurRadius = BlurRadius;
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == nameof(this.MainContent))
+            if (propertyName == nameof(MainContent))
             {
-                mainContent.Content = this.MainContent;
+                mainContent.Content = MainContent;
             }
 
-            if (propertyName == nameof(this.SurfaceColor))
+            if (propertyName == nameof(SurfaceColor))
             {
-                dropShadow.SurfaceColor = this.SurfaceColor;
+                dropShadow.SurfaceColor = SurfaceColor;
             }
 
-            if (propertyName == nameof(this.CornerRadius))
+            if (propertyName == nameof(CornerRadius))
             {
-                dropShadow.CornerRadius = this.CornerRadius;
+                dropShadow.CornerRadius = CornerRadius;
             }
 
-            if (propertyName == nameof(this.OffsetX))
+            if (propertyName == nameof(OffsetX))
             {
-                dropShadow.OffsetX = this.OffsetX;
+                dropShadow.OffsetX = OffsetX;
             }
 
-            if (propertyName == nameof(this.OffsetY))
+            if (propertyName == nameof(OffsetY))
             {
-                dropShadow.OffsetY = this.OffsetY;
+                dropShadow.OffsetY = OffsetY;
             }
 
-            if (propertyName == nameof(this.BlurRadius))
+            if (propertyName == nameof(BlurRadius))
             {
-                dropShadow.BlurRadius = this.BlurRadius;
+                dropShadow.BlurRadius = BlurRadius;
             }
 
-            if (propertyName == nameof(this.ContentPadding))
+            if (propertyName == nameof(ContentPadding))
             {
-                mainContent.Padding = this.ContentPadding;
+                mainContent.Padding = ContentPadding;
             }
         }
     }
diff --git a/XF.Material/UI/Dialogs/BaseMaterialModalPage.cs b/XF.Material/UI/Dialogs/BaseMaterialModalPage.cs
index 5dc2e1d7..3b46058a 100644
--- a/XF.Material/UI/Dialogs/BaseMaterialModalPage.cs
+++ b/XF.Material/UI/Dialogs/BaseMaterialModalPage.cs
@@ -21,7 +21,7 @@ public abstract class BaseMaterialModalPage : PopupPage, IMaterialModalPage
 
         protected BaseMaterialModalPage()
         {
-            this.Animation = new ScaleAnimation()
+            Animation = new ScaleAnimation()
             {
                 DurationIn = 150,
                 DurationOut = 100,
@@ -34,7 +34,7 @@ protected BaseMaterialModalPage()
                 ScaleOut = 1
             };
 
-            this.DisplayOrientation = DeviceDisplay.MainDisplayInfo.Orientation;
+            DisplayOrientation = DeviceDisplay.MainDisplayInfo.Orientation;
         }
 
         public virtual bool Dismissable => true;
@@ -61,7 +61,7 @@ public async Task DismissAsync()
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void Dispose()
         {
-            this.Dispose(true);
+            Dispose(true);
             GC.SuppressFinalize(this);
         }
 
@@ -71,24 +71,31 @@ public void Dispose()
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void RaiseOnBackButtonDismissed()
         {
-            if (_dismissing || Device.RuntimePlatform == Device.iOS) return;
+            if (_dismissing || Device.RuntimePlatform == Device.iOS)
+            {
+                return;
+            }
 
             _dismissing = true;
 
-            this.OnBackButtonDismissed();
+            OnBackButtonDismissed();
         }
 
         protected virtual void OnBackButtonDismissed() { }
 
         protected virtual void Dispose(bool disposing)
         {
-            if (_disposed || !disposing) return;
+            if (_disposed || !disposing)
+            {
+                return;
+            }
+
             Device.BeginInvokeOnMainThread(async () =>
             {
                 try
                 {
-                    await this.DismissAsync();
-                    this.Content = null;
+                    await DismissAsync();
+                    Content = null;
                 }
                 catch (Exception ex)
                 {
@@ -103,20 +110,20 @@ protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            DeviceDisplay.MainDisplayInfoChanged += this.DeviceDisplay_MainDisplayInfoChanged;
+            DeviceDisplay.MainDisplayInfoChanged += DeviceDisplay_MainDisplayInfoChanged;
         }
 
         protected override void OnDisappearing()
         {
             base.OnDisappearing();
 
-            DeviceDisplay.MainDisplayInfoChanged -= this.DeviceDisplay_MainDisplayInfoChanged;
+            DeviceDisplay.MainDisplayInfoChanged -= DeviceDisplay_MainDisplayInfoChanged;
         }
 
         protected override void OnDisappearingAnimationEnd()
         {
             base.OnDisappearingAnimationEnd();
-            this.Dispose();
+            Dispose();
         }
 
         protected virtual void OnOrientationChanged(DisplayOrientation orientation)
@@ -128,13 +135,13 @@ protected virtual void OnOrientationChanged(DisplayOrientation orientation)
         /// </summary>
         protected virtual async Task ShowAsync()
         {
-            if (this.CanShowPopup())
+            if (CanShowPopup())
             {
                 await PopupNavigation.Instance.PushAsync(this, true);
             }
             else
             {
-                await this.DismissAsync();
+                await DismissAsync();
             }
         }
 
@@ -144,14 +151,18 @@ private bool CanShowPopup()
                 .Instance
                 .PopupStack
                 .ToList()
-                .Exists(p => p.GetType() == this.GetType());
+                .Exists(p => p.GetType() == GetType());
         }
 
         private void DeviceDisplay_MainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)
         {
-            if (this.DisplayOrientation == e.DisplayInfo.Orientation) return;
-            this.DisplayOrientation = e.DisplayInfo.Orientation;
-            this.OnOrientationChanged(this.DisplayOrientation);
+            if (DisplayOrientation == e.DisplayInfo.Orientation)
+            {
+                return;
+            }
+
+            DisplayOrientation = e.DisplayInfo.Orientation;
+            OnOrientationChanged(DisplayOrientation);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/UI/Dialogs/Internals/ActionModel.cs b/XF.Material/UI/Dialogs/Internals/ActionModel.cs
index 40566ef5..05b2cefc 100644
--- a/XF.Material/UI/Dialogs/Internals/ActionModel.cs
+++ b/XF.Material/UI/Dialogs/Internals/ActionModel.cs
@@ -26,8 +26,8 @@ internal class ActionModel : BindableObject
 
         public double ItemWidth
         {
-            get => (double)this.GetValue(ItemWidthProperty);
-            set => this.SetValue(ItemWidthProperty, value);
+            get => (double)GetValue(ItemWidthProperty);
+            set => SetValue(ItemWidthProperty, value);
         }
     }
 
diff --git a/XF.Material/UI/Dialogs/MaterialAlertDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialAlertDialog.xaml.cs
index ab08a2d6..407c9073 100644
--- a/XF.Material/UI/Dialogs/MaterialAlertDialog.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialAlertDialog.xaml.cs
@@ -16,21 +16,21 @@ internal MaterialAlertDialog(string message, string title, string action1Text, s
             PositiveButton.Text = action1Text;
             PositiveButton.Command = new Command(async () =>
             {
-                await this.DismissAsync();
-                this.InputTaskCompletionSource?.SetResult(true);
+                await DismissAsync();
+                InputTaskCompletionSource?.SetResult(true);
             });
             NegativeButton.Text = action2Text;
             NegativeButton.Command = new Command(async () =>
             {
-                await this.DismissAsync();
-                this.InputTaskCompletionSource?.SetResult(false);
+                await DismissAsync();
+                InputTaskCompletionSource?.SetResult(false);
             });
         }
 
         internal MaterialAlertDialog(MaterialAlertDialogConfiguration configuration)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
+            InitializeComponent();
+            Configure(configuration);
         }
 
         public TaskCompletionSource<bool?> InputTaskCompletionSource { get; set; }
@@ -65,19 +65,19 @@ protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 560;
@@ -92,12 +92,12 @@ private void ChangeLayout()
 
         protected override void OnBackButtonDismissed()
         {
-            this.InputTaskCompletionSource?.SetResult(null);
+            InputTaskCompletionSource?.SetResult(null);
         }
 
         protected override bool OnBackgroundClicked()
         {
-            this.InputTaskCompletionSource?.SetResult(null);
+            InputTaskCompletionSource?.SetResult(null);
 
             return base.OnBackgroundClicked();
         }
@@ -106,8 +106,12 @@ private void Configure(MaterialAlertDialogConfiguration configuration)
         {
             var preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (preferredConfig == null) return;
-            this.BackgroundColor = preferredConfig.ScrimColor;
+            if (preferredConfig == null)
+            {
+                return;
+            }
+
+            BackgroundColor = preferredConfig.ScrimColor;
             Container.CornerRadius = preferredConfig.CornerRadius;
             Container.BackgroundColor = preferredConfig.BackgroundColor;
             DialogTitle.TextColor = preferredConfig.TitleTextColor;
diff --git a/XF.Material/UI/Dialogs/MaterialConfirmationDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialConfirmationDialog.xaml.cs
index c27da004..05fb70d0 100644
--- a/XF.Material/UI/Dialogs/MaterialConfirmationDialog.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialConfirmationDialog.xaml.cs
@@ -27,8 +27,8 @@ public partial class MaterialConfirmationDialog : BaseMaterialModalPage, IMateri
 
         internal MaterialConfirmationDialog(MaterialConfirmationDialogConfiguration configuration)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
+            InitializeComponent();
+            Configure(configuration);
         }
 
         public TaskCompletionSource<object> InputTaskCompletionSource { get; set; }
@@ -207,27 +207,27 @@ protected override void OnAppearing()
 
             if (_radioButtonGroup?.Choices != null && _radioButtonGroup.Choices.Any())
             {
-                _radioButtonGroup.SelectedIndexChanged += this.DialogActionList_SelectedIndexChanged;
+                _radioButtonGroup.SelectedIndexChanged += DialogActionList_SelectedIndexChanged;
             }
             else if (_checkboxGroup?.Choices != null && _checkboxGroup.Choices.Any())
             {
-                _checkboxGroup.SelectedIndicesChanged += this.CheckboxGroup_SelectedIndicesChanged;
+                _checkboxGroup.SelectedIndicesChanged += CheckboxGroup_SelectedIndicesChanged;
             }
 
-            PositiveButton.Clicked += this.PositiveButton_Clicked;
-            NegativeButton.Clicked += this.NegativeButton_Clicked;
+            PositiveButton.Clicked += PositiveButton_Clicked;
+            NegativeButton.Clicked += NegativeButton_Clicked;
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override void OnBackButtonDismissed()
         {
-            this.InputTaskCompletionSource?.SetResult(_isMultiChoice ? null : -1 as object);
+            InputTaskCompletionSource?.SetResult(_isMultiChoice ? null : -1 as object);
         }
 
         protected override bool OnBackgroundClicked()
         {
-            this.InputTaskCompletionSource?.SetResult(_isMultiChoice ? null : -1 as object);
+            InputTaskCompletionSource?.SetResult(_isMultiChoice ? null : -1 as object);
 
             return base.OnBackgroundClicked();
         }
@@ -238,27 +238,27 @@ protected override void OnDisappearing()
 
             if (_radioButtonGroup?.Choices != null && _radioButtonGroup.Choices.Any())
             {
-                _radioButtonGroup.SelectedIndexChanged -= this.DialogActionList_SelectedIndexChanged;
+                _radioButtonGroup.SelectedIndexChanged -= DialogActionList_SelectedIndexChanged;
             }
             else if (_checkboxGroup?.Choices != null && _checkboxGroup.Choices.Any())
             {
-                _checkboxGroup.SelectedIndicesChanged -= this.CheckboxGroup_SelectedIndicesChanged;
+                _checkboxGroup.SelectedIndicesChanged -= CheckboxGroup_SelectedIndicesChanged;
             }
 
-            PositiveButton.Clicked -= this.PositiveButton_Clicked;
-            NegativeButton.Clicked -= this.NegativeButton_Clicked;
+            PositiveButton.Clicked -= PositiveButton_Clicked;
+            NegativeButton.Clicked -= NegativeButton_Clicked;
         }
 
         protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 560;
@@ -281,8 +281,12 @@ private void Configure(MaterialConfirmationDialogConfiguration configuration)
         {
             _preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (_preferredConfig == null) return;
-            this.BackgroundColor = _preferredConfig.ScrimColor;
+            if (_preferredConfig == null)
+            {
+                return;
+            }
+
+            BackgroundColor = _preferredConfig.ScrimColor;
             Container.CornerRadius = _preferredConfig.CornerRadius;
             Container.BackgroundColor = _preferredConfig.BackgroundColor;
             DialogTitle.TextColor = _preferredConfig.TitleTextColor;
@@ -300,16 +304,16 @@ private void DialogActionList_SelectedIndexChanged(object sender, SelectedIndexC
 
         private async void NegativeButton_Clicked(object sender, EventArgs e)
         {
-            await this.DismissAsync();
-            this.InputTaskCompletionSource.SetResult(_isMultiChoice ? null : -1 as object);
+            await DismissAsync();
+            InputTaskCompletionSource.SetResult(_isMultiChoice ? null : -1 as object);
             _checkboxGroup?.SelectedIndices.Clear();
         }
 
         private async void PositiveButton_Clicked(object sender, EventArgs e)
         {
-            await this.DismissAsync();
+            await DismissAsync();
             var result = (_radioButtonGroup?.SelectedIndex) ?? _checkboxGroup?.SelectedIndices.ToArray() as object;
-            this.InputTaskCompletionSource.SetResult(result);
+            InputTaskCompletionSource.SetResult(result);
             _checkboxGroup?.SelectedIndices.Clear();
         }
     }
diff --git a/XF.Material/UI/Dialogs/MaterialDialogFragment.xaml.cs b/XF.Material/UI/Dialogs/MaterialDialogFragment.xaml.cs
index 53d39496..6a05cbdf 100644
--- a/XF.Material/UI/Dialogs/MaterialDialogFragment.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialDialogFragment.xaml.cs
@@ -12,9 +12,9 @@ public partial class MaterialDialogFragment : BaseMaterialModalPage, IMaterialAw
     {
         internal MaterialDialogFragment(MaterialAlertDialogConfiguration configuration)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
-            this.InputTaskCompletionSource = new TaskCompletionSource<bool?>();
+            InitializeComponent();
+            Configure(configuration);
+            InputTaskCompletionSource = new TaskCompletionSource<bool?>();
         }
 
         public TaskCompletionSource<bool?> InputTaskCompletionSource { get; set; }
@@ -37,12 +37,12 @@ internal MaterialDialogFragment(MaterialAlertDialogConfiguration configuration)
 
         protected override void OnBackButtonDismissed()
         {
-            this.InputTaskCompletionSource?.SetResult(null);
+            InputTaskCompletionSource?.SetResult(null);
         }
 
         protected override bool OnBackgroundClicked()
         {
-            this.InputTaskCompletionSource?.SetResult(null);
+            InputTaskCompletionSource?.SetResult(null);
             return base.OnBackgroundClicked();
         }
 
@@ -50,30 +50,30 @@ protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            PositiveButton.Clicked += this.PositiveButton_Clicked;
-            NegativeButton.Clicked += this.NegativeButton_Clicked;
+            PositiveButton.Clicked += PositiveButton_Clicked;
+            NegativeButton.Clicked += NegativeButton_Clicked;
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override void OnDisappearing()
         {
             base.OnDisappearing();
 
-            PositiveButton.Clicked -= this.PositiveButton_Clicked;
-            NegativeButton.Clicked -= this.NegativeButton_Clicked;
+            PositiveButton.Clicked -= PositiveButton_Clicked;
+            NegativeButton.Clicked -= NegativeButton_Clicked;
         }
 
         protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 560;
@@ -92,8 +92,12 @@ private void Configure(MaterialAlertDialogConfiguration configuration)
         {
             var preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (preferredConfig == null) return;
-            this.BackgroundColor = preferredConfig.ScrimColor;
+            if (preferredConfig == null)
+            {
+                return;
+            }
+
+            BackgroundColor = preferredConfig.ScrimColor;
             Container.CornerRadius = preferredConfig.CornerRadius;
             Container.BackgroundColor = preferredConfig.BackgroundColor;
             DialogTitle.TextColor = preferredConfig.TitleTextColor;
@@ -108,14 +112,14 @@ private void Configure(MaterialAlertDialogConfiguration configuration)
 
         private async void NegativeButton_Clicked(object sender, EventArgs e)
         {
-            await this.DismissAsync();
-            this.InputTaskCompletionSource?.SetResult(false);
+            await DismissAsync();
+            InputTaskCompletionSource?.SetResult(false);
         }
 
         private async void PositiveButton_Clicked(object sender, EventArgs e)
         {
-            await this.DismissAsync();
-            this.InputTaskCompletionSource?.SetResult(true);
+            await DismissAsync();
+            InputTaskCompletionSource?.SetResult(true);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/UI/Dialogs/MaterialInputDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialInputDialog.xaml.cs
index 47941f38..3744fd3c 100644
--- a/XF.Material/UI/Dialogs/MaterialInputDialog.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialInputDialog.xaml.cs
@@ -11,7 +11,7 @@ public partial class MaterialInputDialog : BaseMaterialModalPage, IMaterialAwait
     {
         internal MaterialInputDialog(string title = null, string message = null, string inputText = null, string inputPlaceholder = "Enter input", string confirmingText = "Ok", string dismissiveText = "Cancel", MaterialInputDialogConfiguration configuration = null) : this(configuration)
         {
-            this.InputTaskCompletionSource = new TaskCompletionSource<string>();
+            InputTaskCompletionSource = new TaskCompletionSource<string>();
             Message.Text = message;
             DialogTitle.Text = title;
             TextField.Placeholder = inputPlaceholder;
@@ -20,20 +20,20 @@ internal MaterialInputDialog(string title = null, string message = null, string
             NegativeButton.Text = dismissiveText;
             PositiveButton.Command = new Command(async () =>
             {
-                await this.DismissAsync();
-                this.InputTaskCompletionSource?.SetResult(TextField.Text);
+                await DismissAsync();
+                InputTaskCompletionSource?.SetResult(TextField.Text);
             });
             NegativeButton.Command = new Command(async () =>
             {
-                await this.DismissAsync();
-                this.InputTaskCompletionSource?.SetResult(string.Empty);
+                await DismissAsync();
+                InputTaskCompletionSource?.SetResult(string.Empty);
             });
         }
 
         internal MaterialInputDialog(MaterialInputDialogConfiguration configuration = null)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
+            InitializeComponent();
+            Configure(configuration);
         }
 
         public TaskCompletionSource<string> InputTaskCompletionSource { get; set; }
@@ -53,21 +53,21 @@ public static async Task<string> Show(string title = null, string message = null
 
         protected override void OnBackButtonDismissed()
         {
-            this.InputTaskCompletionSource?.SetResult(string.Empty);
+            InputTaskCompletionSource?.SetResult(string.Empty);
         }
 
         protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            TextField.TextChanged += this.TextField_TextChanged;
+            TextField.TextChanged += TextField_TextChanged;
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override bool OnBackgroundClicked()
         {
-            this.InputTaskCompletionSource?.SetResult(string.Empty);
+            InputTaskCompletionSource?.SetResult(string.Empty);
 
             return base.OnBackgroundClicked();
         }
@@ -76,19 +76,19 @@ protected override void OnDisappearing()
         {
             base.OnDisappearing();
 
-            TextField.TextChanged -= this.TextField_TextChanged;
+            TextField.TextChanged -= TextField_TextChanged;
         }
 
         protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 560;
@@ -105,8 +105,12 @@ private void Configure(MaterialInputDialogConfiguration configuration)
         {
             var preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (preferredConfig == null) return;
-            this.BackgroundColor = preferredConfig.ScrimColor;
+            if (preferredConfig == null)
+            {
+                return;
+            }
+
+            BackgroundColor = preferredConfig.ScrimColor;
             Container.CornerRadius = preferredConfig.CornerRadius;
             Container.BackgroundColor = preferredConfig.BackgroundColor;
             DialogTitle.TextColor = preferredConfig.TitleTextColor;
diff --git a/XF.Material/UI/Dialogs/MaterialLoadingDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialLoadingDialog.xaml.cs
index 0600e5cd..ad1678ee 100644
--- a/XF.Material/UI/Dialogs/MaterialLoadingDialog.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialLoadingDialog.xaml.cs
@@ -11,8 +11,8 @@ public partial class MaterialLoadingDialog : BaseMaterialModalPage
     {
         internal MaterialLoadingDialog(string message, MaterialLoadingDialogConfiguration configuration)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
+            InitializeComponent();
+            Configure(configuration);
             Message.Text = message;
         }
 
@@ -20,8 +20,8 @@ internal MaterialLoadingDialog(string message, MaterialLoadingDialogConfiguratio
 
         public override string MessageText
         {
-            get { return this.Message.Text; }
-            set { this.Message.Text = value; }
+            get { return Message.Text; }
+            set { Message.Text = value; }
         }
 
         internal static MaterialLoadingDialogConfiguration GlobalConfiguration { get; set; }
@@ -40,19 +40,19 @@ protected override void OnAppearing()
 
             LoadingImage.Play();
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 560;
@@ -69,8 +69,12 @@ private void Configure(MaterialLoadingDialogConfiguration configuration)
         {
             var preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (preferredConfig == null) return;
-            this.BackgroundColor = preferredConfig.ScrimColor;
+            if (preferredConfig == null)
+            {
+                return;
+            }
+
+            BackgroundColor = preferredConfig.ScrimColor;
             Container.CornerRadius = preferredConfig.CornerRadius;
             Container.BackgroundColor = preferredConfig.BackgroundColor;
             Message.TextColor = preferredConfig.MessageTextColor;
diff --git a/XF.Material/UI/Dialogs/MaterialMenuDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialMenuDialog.xaml.cs
index bb711f5b..c8ef9651 100644
--- a/XF.Material/UI/Dialogs/MaterialMenuDialog.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialMenuDialog.xaml.cs
@@ -14,10 +14,10 @@ internal struct MaterialMenuDimension
     {
         public MaterialMenuDimension(double rawX, double rawY, double width, double height)
         {
-            this.RawX = rawX;
-            this.RawY = rawY;
-            this.Width = width;
-            this.Height = height;
+            RawX = rawX;
+            RawY = rawY;
+            Width = width;
+            Height = height;
         }
 
         public double Height { get; }
@@ -42,9 +42,9 @@ internal MaterialMenuDialog(List<MaterialMenuItem> choices, MaterialMenuDimensio
         {
             _dimension = dimension;
             _choices = choices;
-            this.InitializeComponent();
-            this.CreateActions(configuration);
-            this.InputTaskCompletionSource = new TaskCompletionSource<int>();
+            InitializeComponent();
+            CreateActions(configuration);
+            InputTaskCompletionSource = new TaskCompletionSource<int>();
 
             Container.CornerRadius = configuration.CornerRadius;
             Container.BackgroundColor = configuration.BackgroundColor;
@@ -75,7 +75,7 @@ protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            DeviceDisplay.MainDisplayInfoChanged += this.DeviceDisplay_MainDisplayInfoChanged;
+            DeviceDisplay.MainDisplayInfoChanged += DeviceDisplay_MainDisplayInfoChanged;
         }
 
         protected override void OnAppearingAnimationBegin()
@@ -84,8 +84,8 @@ protected override void OnAppearingAnimationBegin()
 
             var newX = _dimension.RawX;
             var newY = _dimension.RawY;
-            var width = this.Width - 56;
-            var height = this.Height - 56;
+            var width = Width - 56;
+            var height = Height - 56;
 
             _maxWidth += 32;
             DialogActionList.WidthRequest = _maxWidth <= 112 ? 112 : _maxWidth;
@@ -111,12 +111,12 @@ protected override void OnAppearingAnimationBegin()
 
         protected override void OnBackButtonDismissed()
         {
-            this.InputTaskCompletionSource.SetResult(-1);
+            InputTaskCompletionSource.SetResult(-1);
         }
 
         protected override bool OnBackgroundClicked()
         {
-            this.InputTaskCompletionSource.SetResult(-1);
+            InputTaskCompletionSource.SetResult(-1);
 
             return base.OnBackgroundClicked();
         }
@@ -125,12 +125,12 @@ protected override void OnDisappearing()
         {
             base.OnDisappearing();
 
-            DeviceDisplay.MainDisplayInfoChanged -= this.DeviceDisplay_MainDisplayInfoChanged;
+            DeviceDisplay.MainDisplayInfoChanged -= DeviceDisplay_MainDisplayInfoChanged;
         }
 
         private async void DeviceDisplay_MainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)
         {
-            await this.DismissAsync();
+            await DismissAsync();
         }
 
         private void CreateActions(MaterialMenuConfiguration configuration)
@@ -153,18 +153,22 @@ private void CreateActions(MaterialMenuConfiguration configuration)
                 };
                 actionModel.SelectedCommand = new Command<int>(async (position) =>
                 {
-                    if (this.InputTaskCompletionSource?.Task.Status != TaskStatus.WaitingForActivation) return;
+                    if (InputTaskCompletionSource?.Task.Status != TaskStatus.WaitingForActivation)
+                    {
+                        return;
+                    }
+
                     actionModel.IsSelected = true;
-                    await this.DismissAsync();
-                    this.InputTaskCompletionSource?.SetResult(position);
+                    await DismissAsync();
+                    InputTaskCompletionSource?.SetResult(position);
                 });
-                actionModel.SizeChangeCommand = new Command<Dictionary<string, object>>(this.LabelSizeChanged);
+                actionModel.SizeChangeCommand = new Command<Dictionary<string, object>>(LabelSizeChanged);
 
                 actionModels.Add(actionModel);
                 actionModel.Index = actionModels.IndexOf(actionModel);
             });
 
-            this.SetList(actionModels);
+            SetList(actionModels);
         }
 
 
diff --git a/XF.Material/UI/Dialogs/MaterialSimpleDialog.xaml.cs b/XF.Material/UI/Dialogs/MaterialSimpleDialog.xaml.cs
index d105c4e3..c2ccc133 100644
--- a/XF.Material/UI/Dialogs/MaterialSimpleDialog.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialSimpleDialog.xaml.cs
@@ -15,8 +15,8 @@ public partial class MaterialSimpleDialog : BaseMaterialModalPage, IMaterialAwai
     {
         internal MaterialSimpleDialog(MaterialSimpleDialogConfiguration configuration)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
+            InitializeComponent();
+            Configure(configuration);
         }
 
         public TaskCompletionSource<int> InputTaskCompletionSource { get; set; }
@@ -41,8 +41,12 @@ private void Configure(MaterialSimpleDialogConfiguration configuration)
         {
             var preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (preferredConfig == null) return;
-            this.BackgroundColor = preferredConfig.ScrimColor;
+            if (preferredConfig == null)
+            {
+                return;
+            }
+
+            BackgroundColor = preferredConfig.ScrimColor;
             Container.CornerRadius = preferredConfig.CornerRadius;
             Container.BackgroundColor = preferredConfig.BackgroundColor;
             DialogTitle.TextColor = preferredConfig.TitleTextColor;
@@ -71,10 +75,14 @@ private void CreateActions(List<string> actions, MaterialSimpleDialogConfigurati
                 };
                 actionModel.SelectedCommand = new Command<int>(async (position) =>
                 {
-                    if (this.InputTaskCompletionSource?.Task.Status != TaskStatus.WaitingForActivation) return;
+                    if (InputTaskCompletionSource?.Task.Status != TaskStatus.WaitingForActivation)
+                    {
+                        return;
+                    }
+
                     actionModel.IsSelected = true;
-                    await this.DismissAsync();
-                    this.InputTaskCompletionSource?.SetResult(position);
+                    await DismissAsync();
+                    InputTaskCompletionSource?.SetResult(position);
                 });
 
                 actionModels.Add(actionModel);
@@ -88,19 +96,19 @@ protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 560;
@@ -115,12 +123,12 @@ private void ChangeLayout()
 
         protected override void OnBackButtonDismissed()
         {
-            this.InputTaskCompletionSource.SetResult(-1);
+            InputTaskCompletionSource.SetResult(-1);
         }
 
         protected override bool OnBackgroundClicked()
         {
-            this.InputTaskCompletionSource.SetResult(-1);
+            InputTaskCompletionSource.SetResult(-1);
 
             return base.OnBackgroundClicked();
         }
diff --git a/XF.Material/UI/Dialogs/MaterialSnackbar.xaml.cs b/XF.Material/UI/Dialogs/MaterialSnackbar.xaml.cs
index 1742bfca..c15a8fd5 100644
--- a/XF.Material/UI/Dialogs/MaterialSnackbar.xaml.cs
+++ b/XF.Material/UI/Dialogs/MaterialSnackbar.xaml.cs
@@ -19,19 +19,19 @@ public partial class MaterialSnackbar : BaseMaterialModalPage, IMaterialAwaitabl
 
         internal MaterialSnackbar(string message, string actionButtonText, int msDuration = DurationLong, MaterialSnackbarConfiguration configuration = null)
         {
-            this.InitializeComponent();
-            this.Configure(configuration);
+            InitializeComponent();
+            Configure(configuration);
             Message.Text = message;
             _duration = msDuration;
             ActionButton.Text = actionButtonText;
             var primaryActionCommand = new Command(async () =>
             {
                 _primaryActionRunning = true;
-                await this.DismissAsync();
-                this.InputTaskCompletionSource?.SetResult(true);
+                await DismissAsync();
+                InputTaskCompletionSource?.SetResult(true);
             }, () => !_primaryActionRunning);
             ActionButton.Command = primaryActionCommand;
-            _hideAction = () => this.InputTaskCompletionSource?.SetResult(false);
+            _hideAction = () => InputTaskCompletionSource?.SetResult(false);
         }
 
         public TaskCompletionSource<bool> InputTaskCompletionSource { get; set; }
@@ -75,31 +75,39 @@ protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         protected override async void OnAppearingAnimationEnd()
         {
             base.OnAppearingAnimationEnd();
 
-            if (_duration <= 0) return;
+            if (_duration <= 0)
+            {
+                return;
+            }
+
             await Task.Delay(_duration);
 
-            if (_primaryActionRunning) return;
+            if (_primaryActionRunning)
+            {
+                return;
+            }
+
             _hideAction?.Invoke();
-            await this.DismissAsync();
+            await DismissAsync();
         }
 
         protected override void OnOrientationChanged(DisplayOrientation orientation)
         {
             base.OnOrientationChanged(orientation);
 
-            this.ChangeLayout();
+            ChangeLayout();
         }
 
         private void ChangeLayout()
         {
-            switch (this.DisplayOrientation)
+            switch (DisplayOrientation)
             {
                 case DisplayOrientation.Landscape when Device.Idiom == TargetIdiom.Phone:
                     Container.WidthRequest = 344;
@@ -116,7 +124,11 @@ private void Configure(MaterialSnackbarConfiguration configuration)
         {
             var preferredConfig = configuration ?? GlobalConfiguration;
 
-            if (preferredConfig == null) return;
+            if (preferredConfig == null)
+            {
+                return;
+            }
+
             Message.FontFamily = preferredConfig.MessageFontFamily;
             Message.TextColor = preferredConfig.MessageTextColor;
             Container.BackgroundColor = preferredConfig.BackgroundColor;
diff --git a/XF.Material/UI/Internals/BaseMaterialSelectionControl.xaml.cs b/XF.Material/UI/Internals/BaseMaterialSelectionControl.xaml.cs
index 93604e5c..49419423 100644
--- a/XF.Material/UI/Internals/BaseMaterialSelectionControl.xaml.cs
+++ b/XF.Material/UI/Internals/BaseMaterialSelectionControl.xaml.cs
@@ -69,10 +69,10 @@ public partial class BaseMaterialSelectionControl : ContentView
 
         internal BaseMaterialSelectionControl(MaterialSelectionControlType controlType)
         {
-            this.InitializeComponent();
-            this.SetPropertyChangeHandler(ref _propertyChangeActions);
-            this.SetControlType(controlType);
-            this.SetControl();
+            InitializeComponent();
+            SetPropertyChangeHandler(ref _propertyChangeActions);
+            SetControlType(controlType);
+            SetControl();
         }
 
         /// <summary>
@@ -85,8 +85,8 @@ internal BaseMaterialSelectionControl(MaterialSelectionControlType controlType)
         /// </summary>
         public string FontFamily
         {
-            get => (string)this.GetValue(FontFamilyProperty);
-            set => this.SetValue(FontFamilyProperty, value);
+            get => (string)GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
         }
 
         /// <summary>
@@ -94,8 +94,8 @@ public string FontFamily
         /// </summary>
         public double FontSize
         {
-            get => (double)this.GetValue(FontSizeProperty);
-            set => this.SetValue(FontSizeProperty, value);
+            get => (double)GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
         }
 
         /// <summary>
@@ -103,8 +103,8 @@ public double FontSize
         /// </summary>
         public double HorizontalSpacing
         {
-            get => (double)this.GetValue(HorizontalSpacingProperty);
-            set => this.SetValue(HorizontalSpacingProperty, value);
+            get => (double)GetValue(HorizontalSpacingProperty);
+            set => SetValue(HorizontalSpacingProperty, value);
         }
 
         /// <summary>
@@ -112,8 +112,8 @@ public double HorizontalSpacing
         /// </summary>
         public bool IsSelected
         {
-            get => (bool)this.GetValue(IsSelectedProperty);
-            set => this.SetValue(IsSelectedProperty, value);
+            get => (bool)GetValue(IsSelectedProperty);
+            set => SetValue(IsSelectedProperty, value);
         }
 
         /// <summary>
@@ -121,8 +121,8 @@ public bool IsSelected
         /// </summary>
         public Command<bool> SelectedChangeCommand
         {
-            get => (Command<bool>)this.GetValue(SelectedChangeCommandProperty);
-            set => this.SetValue(SelectedChangeCommandProperty, value);
+            get => (Command<bool>)GetValue(SelectedChangeCommandProperty);
+            set => SetValue(SelectedChangeCommandProperty, value);
         }
 
         /// <summary>
@@ -130,8 +130,8 @@ public Command<bool> SelectedChangeCommand
         /// </summary>
         public Color SelectedColor
         {
-            get => (Color)this.GetValue(SelectedColorProperty);
-            set => this.SetValue(SelectedColorProperty, value);
+            get => (Color)GetValue(SelectedColorProperty);
+            set => SetValue(SelectedColorProperty, value);
         }
 
         /// <summary>
@@ -139,8 +139,8 @@ public Color SelectedColor
         /// </summary>
         public string Text
         {
-            get => (string)this.GetValue(TextProperty);
-            set => this.SetValue(TextProperty, value);
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
         }
 
         /// <summary>
@@ -148,8 +148,8 @@ public string Text
         /// </summary>
         public Color TextColor
         {
-            get => (Color)this.GetValue(TextColorProperty);
-            set => this.SetValue(TextColorProperty, value);
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
         }
 
         /// <summary>
@@ -157,21 +157,24 @@ public Color TextColor
         /// </summary>
         public Color UnselectedColor
         {
-            get => (Color)this.GetValue(UnselectedColorProperty);
-            set => this.SetValue(UnselectedColorProperty, value);
+            get => (Color)GetValue(UnselectedColorProperty);
+            set => SetValue(UnselectedColorProperty, value);
         }
 
         internal double VerticalSpacing
         {
-            get => (double)this.GetValue(VerticalSpacingProperty);
-            set => this.SetValue(VerticalSpacingProperty, value);
+            get => (double)GetValue(VerticalSpacingProperty);
+            set => SetValue(VerticalSpacingProperty, value);
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == null) return;
+            if (propertyName == null)
+            {
+                return;
+            }
 
             if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(propertyName, out var handlePropertyChange))
             {
@@ -181,7 +184,7 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
         private void OnEnableChanged(bool isEnabled)
         {
-            this.Opacity = isEnabled ? 1.0 : 0.38;
+            Opacity = isEnabled ? 1.0 : 0.38;
         }
 
         private void OnFontFamilyChanged(string fontFamily)
@@ -202,41 +205,41 @@ private void OnHorizontalSpacingChanged(double value)
         private void OnSelectedChanged(bool isSelected)
         {
             selectionIcon.Source = isSelected ? _selectedSource : _unselectedSource;
-            selectionIcon.TintColor = isSelected ? this.SelectedColor : this.UnselectedColor;
-            this.SelectedChanged?.Invoke(this, new SelectedChangedEventArgs(isSelected));
-            this.SelectedChangeCommand?.Execute(isSelected);
+            selectionIcon.TintColor = isSelected ? SelectedColor : UnselectedColor;
+            SelectedChanged?.Invoke(this, new SelectedChangedEventArgs(isSelected));
+            SelectedChangeCommand?.Execute(isSelected);
         }
 
         private void OnStateColorChanged(bool isSelected)
         {
-            selectionIcon.TintColor = isSelected ? this.SelectedColor : this.UnselectedColor;
+            selectionIcon.TintColor = isSelected ? SelectedColor : UnselectedColor;
         }
 
         private void OnTextChanged()
         {
-            selectionText.Text = this.Text;
+            selectionText.Text = Text;
         }
 
         private void OnTextColorChanged()
         {
-            selectionText.TextColor = this.TextColor;
+            selectionText.TextColor = TextColor;
         }
 
         private void OnVerticalSpacingChanged(double value)
         {
-            this.Margin = new Thickness(this.Margin.Left, this.Margin.Top, this.Margin.Right, value);
+            Margin = new Thickness(Margin.Left, Margin.Top, Margin.Right, value);
         }
 
         private void SetControl()
         {
-            selectionIcon.Source = this.IsSelected ? _selectedSource : _unselectedSource;
-            selectionIcon.TintColor = this.IsSelected ? this.SelectedColor : this.UnselectedColor;
+            selectionIcon.Source = IsSelected ? _selectedSource : _unselectedSource;
+            selectionIcon.TintColor = IsSelected ? SelectedColor : UnselectedColor;
             iconButton.Command = selectionButton.Command = new Command(() =>
             {
-                this.IsSelected = !this.IsSelected;
+                IsSelected = !IsSelected;
             });
 
-            selectionText.Text = this.Text;
+            selectionText.Text = Text;
         }
 
         private void SetControlType(MaterialSelectionControlType controlType)
@@ -260,16 +263,16 @@ private void SetPropertyChangeHandler(ref Dictionary<string, Action> propertyCha
         {
             propertyChangeActions = new Dictionary<string, Action>
             {
-                { nameof(this.Text), this.OnTextChanged },
-                { nameof(this.TextColor), this.OnTextColorChanged },
-                { nameof(this.IsSelected), () => this.OnSelectedChanged(this.IsSelected) },
-                { nameof(this.SelectedColor), () => this.OnStateColorChanged(this.IsSelected) },
-                { nameof(this.UnselectedColor), () => this.OnStateColorChanged(this.IsSelected) },
-                { nameof(this.IsEnabled), () => this.OnEnableChanged(this.IsEnabled) },
-                { nameof(this.FontFamily), () => this.OnFontFamilyChanged(this.FontFamily) },
-                { nameof(this.HorizontalSpacing), () => this.OnHorizontalSpacingChanged(this.HorizontalSpacing) },
-                { nameof(this.VerticalSpacing), () => this.OnVerticalSpacingChanged(this.VerticalSpacing) },
-                { nameof(this.FontSize), () => this.OnFontSizeChanged(this.FontSize) },
+                { nameof(Text), OnTextChanged },
+                { nameof(TextColor), OnTextColorChanged },
+                { nameof(IsSelected), () => OnSelectedChanged(IsSelected) },
+                { nameof(SelectedColor), () => OnStateColorChanged(IsSelected) },
+                { nameof(UnselectedColor), () => OnStateColorChanged(IsSelected) },
+                { nameof(IsEnabled), () => OnEnableChanged(IsEnabled) },
+                { nameof(FontFamily), () => OnFontFamilyChanged(FontFamily) },
+                { nameof(HorizontalSpacing), () => OnHorizontalSpacingChanged(HorizontalSpacing) },
+                { nameof(VerticalSpacing), () => OnVerticalSpacingChanged(VerticalSpacing) },
+                { nameof(FontSize), () => OnFontSizeChanged(FontSize) },
             };
         }
     }
diff --git a/XF.Material/UI/Internals/BaseMaterialSelectionControlGroup.cs b/XF.Material/UI/Internals/BaseMaterialSelectionControlGroup.cs
index 434a886a..d195b954 100644
--- a/XF.Material/UI/Internals/BaseMaterialSelectionControlGroup.cs
+++ b/XF.Material/UI/Internals/BaseMaterialSelectionControlGroup.cs
@@ -56,8 +56,8 @@ public abstract class BaseMaterialSelectionControlGroup : ContentView
 
         internal bool ShouldShowScrollbar
         {
-            get => (bool)this.GetValue(ShouldShowScrollbarProperty);
-            set => this.SetValue(ShouldShowScrollbarProperty, value);
+            get => (bool)GetValue(ShouldShowScrollbarProperty);
+            set => SetValue(ShouldShowScrollbarProperty, value);
         }
 
         /// <summary>
@@ -65,8 +65,8 @@ internal bool ShouldShowScrollbar
         /// </summary>
         public IList<string> Choices
         {
-            get => (IList<string>)this.GetValue(ChoicesProperty);
-            set => this.SetValue(ChoicesProperty, value);
+            get => (IList<string>)GetValue(ChoicesProperty);
+            set => SetValue(ChoicesProperty, value);
         }
 
         /// <summary>
@@ -74,8 +74,8 @@ public IList<string> Choices
         /// </summary>
         public string FontFamily
         {
-            get => (string)this.GetValue(FontFamilyProperty);
-            set => this.SetValue(FontFamilyProperty, value);
+            get => (string)GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
         }
 
         /// <summary>
@@ -83,8 +83,8 @@ public string FontFamily
         /// </summary>
         public double FontSize
         {
-            get => (double)this.GetValue(FontSizeProperty);
-            set => this.SetValue(FontSizeProperty, value);
+            get => (double)GetValue(FontSizeProperty);
+            set => SetValue(FontSizeProperty, value);
         }
 
         /// <summary>
@@ -92,8 +92,8 @@ public double FontSize
         /// </summary>
         public double HorizontalSpacing
         {
-            get => (double)this.GetValue(HorizontalSpacingProperty);
-            set => this.SetValue(HorizontalSpacingProperty, value);
+            get => (double)GetValue(HorizontalSpacingProperty);
+            set => SetValue(HorizontalSpacingProperty, value);
         }
 
         /// <summary>
@@ -101,8 +101,8 @@ public double HorizontalSpacing
         /// </summary>
         public Color SelectedColor
         {
-            get => (Color)this.GetValue(SelectedColorProperty);
-            set => this.SetValue(SelectedColorProperty, value);
+            get => (Color)GetValue(SelectedColorProperty);
+            set => SetValue(SelectedColorProperty, value);
         }
 
         /// <summary>
@@ -110,8 +110,8 @@ public Color SelectedColor
         /// </summary>
         public Color TextColor
         {
-            get => (Color)this.GetValue(TextColorProperty);
-            set => this.SetValue(TextColorProperty, value);
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
         }
 
         /// <summary>
@@ -119,8 +119,8 @@ public Color TextColor
         /// </summary>
         public Color UnselectedColor
         {
-            get => (Color)this.GetValue(UnselectedColorProperty);
-            set => this.SetValue(UnselectedColorProperty, value);
+            get => (Color)GetValue(UnselectedColorProperty);
+            set => SetValue(UnselectedColorProperty, value);
         }
 
         /// <summary>
@@ -128,8 +128,8 @@ public Color UnselectedColor
         /// </summary>
         public double VerticalSpacing
         {
-            get => (double)this.GetValue(VerticalSpacingProperty);
-            set => this.SetValue(VerticalSpacingProperty, value);
+            get => (double)GetValue(VerticalSpacingProperty);
+            set => SetValue(VerticalSpacingProperty, value);
         }
 
         internal abstract ObservableCollection<MaterialSelectionControlModel> Models { get; }
@@ -142,11 +142,11 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
             switch (propertyName)
             {
-                case nameof(this.Choices) when this.Choices != null && this.Choices.Any():
-                    this.CreateChoices();
+                case nameof(Choices) when Choices != null && Choices.Any():
+                    CreateChoices();
                     break;
-                case nameof(this.IsEnabled):
-                    this.Opacity = this.IsEnabled ? 1.0 : 0.38;
+                case nameof(IsEnabled):
+                    Opacity = IsEnabled ? 1.0 : 0.38;
                     break;
             }
         }
diff --git a/XF.Material/UI/Internals/MaterialBoxView.cs b/XF.Material/UI/Internals/MaterialBoxView.cs
index 5c345d21..8753ce8b 100644
--- a/XF.Material/UI/Internals/MaterialBoxView.cs
+++ b/XF.Material/UI/Internals/MaterialBoxView.cs
@@ -15,7 +15,7 @@ internal MaterialBoxView() { }
 
         public void OnTapped(double x, double y)
         {
-            this.Tapped?.Invoke(this, new TappedEventArgs(x, y));
+            Tapped?.Invoke(this, new TappedEventArgs(x, y));
         }
     }
 
@@ -31,8 +31,8 @@ internal class TappedEventArgs : EventArgs
 
         internal TappedEventArgs(double x, double y)
         {
-            this.X = x;
-            this.Y = y;
+            X = x;
+            Y = y;
         }
     }
 }
diff --git a/XF.Material/UI/Internals/MaterialDatePicker.cs b/XF.Material/UI/Internals/MaterialDatePicker.cs
index aba252e9..ce6fba49 100644
--- a/XF.Material/UI/Internals/MaterialDatePicker.cs
+++ b/XF.Material/UI/Internals/MaterialDatePicker.cs
@@ -21,12 +21,12 @@ public Color TintColor
         {
             get
             {
-                return (Color)this.GetValue(TintColorProperty);
+                return (Color)GetValue(TintColorProperty);
             }
 
             set
             {
-                this.SetValue(TintColorProperty, value);
+                SetValue(TintColorProperty, value);
             }
         }
 
@@ -34,41 +34,41 @@ public Color TintColor
 
         public DateTime? NullableDate
         {
-            get { return (DateTime?)this.GetValue(NullableDateProperty); }
+            get { return (DateTime?)GetValue(NullableDateProperty); }
 
             set
             {
-                if (this.NullableDate != value)
+                if (NullableDate != value)
                 {
-                    this.SetValue(NullableDateProperty, value);
-                    this.UpdateDate();
+                    SetValue(NullableDateProperty, value);
+                    UpdateDate();
                 }
             }
         }
 
         private void UpdateDate()
         {
-            if (this.NullableDate.HasValue)
+            if (NullableDate.HasValue)
             {
-                if (this._color.HasValue)
+                if (_color.HasValue)
                 {
-                    this.TextColor = this._color.Value;
-                    this._color = null;
+                    TextColor = _color.Value;
+                    _color = null;
                 }
 
-                this.Date = this.NullableDate.Value;
+                Date = NullableDate.Value;
             }
             else
             {
-                this._color = this.TextColor;
-                this.TextColor = Color.Transparent;
+                _color = TextColor;
+                TextColor = Color.Transparent;
             }
         }
 
         protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
-            this.UpdateDate();
+            UpdateDate();
         }
 
         public new EventHandler<NullableDateChangedEventArgs> DateSelected;
@@ -77,11 +77,11 @@ protected override void OnPropertyChanged(string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == nameof(this.IsFocused) && !this.IsFocused && this.Date != this.NullableDate)
+            if (propertyName == nameof(IsFocused) && !IsFocused && Date != NullableDate)
             {
-                DateTime? old = this.NullableDate;
-                this.NullableDate = this.Date;
-                this.DateSelected(this, new NullableDateChangedEventArgs(old, this.NullableDate));
+                var old = NullableDate;
+                NullableDate = Date;
+                DateSelected(this, new NullableDateChangedEventArgs(old, NullableDate));
             }
         }
     }
diff --git a/XF.Material/UI/Internals/MaterialEntry.cs b/XF.Material/UI/Internals/MaterialEntry.cs
index 6c2c1aae..66c77682 100644
--- a/XF.Material/UI/Internals/MaterialEntry.cs
+++ b/XF.Material/UI/Internals/MaterialEntry.cs
@@ -18,14 +18,14 @@ internal MaterialEntry()
 
         public bool IsNumericKeyboard
         {
-            get => (bool)this.GetValue(IsNumericKeyboardProperty);
-            set => this.SetValue(IsNumericKeyboardProperty, value);
+            get => (bool)GetValue(IsNumericKeyboardProperty);
+            set => SetValue(IsNumericKeyboardProperty, value);
         }
 
         public Color TintColor
         {
-            get => (Color)this.GetValue(TintColorProperty);
-            set => this.SetValue(TintColorProperty, value);
+            get => (Color)GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs b/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs
index 0520d73e..e5edbd05 100644
--- a/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs
+++ b/XF.Material/UI/Internals/MaterialInputDialogTextField.xaml.cs
@@ -57,9 +57,9 @@ public partial class MaterialInputDialogTextField : ContentView, IMaterialElemen
         /// </summary>
         internal MaterialInputDialogTextField()
         {
-            this.InitializeComponent();
-            this.SetPropertyChangeHandler(ref _propertyChangeActions);
-            this.SetControl();
+            InitializeComponent();
+            SetPropertyChangeHandler(ref _propertyChangeActions);
+            SetControl();
         }
 
         /// <summary>
@@ -77,8 +77,8 @@ internal MaterialInputDialogTextField()
         /// </summary>
         public bool AlwaysShowUnderline
         {
-            get => (bool)this.GetValue(AlwaysShowUnderlineProperty);
-            set => this.SetValue(AlwaysShowUnderlineProperty, value);
+            get => (bool)GetValue(AlwaysShowUnderlineProperty);
+            set => SetValue(AlwaysShowUnderlineProperty, value);
         }
 
         /// <summary>
@@ -86,8 +86,8 @@ public bool AlwaysShowUnderline
         /// </summary>
         public new Color BackgroundColor
         {
-            get => (Color)this.GetValue(BackgroundColorProperty);
-            set => this.SetValue(BackgroundColorProperty, value);
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
         }
 
         /// <summary>
@@ -96,8 +96,8 @@ public bool AlwaysShowUnderline
         /// </summary>
         public Color ErrorColor
         {
-            get => (Color)this.GetValue(ErrorColorProperty);
-            set => this.SetValue(ErrorColorProperty, value);
+            get => (Color)GetValue(ErrorColorProperty);
+            set => SetValue(ErrorColorProperty, value);
         }
 
         /// <summary>
@@ -105,8 +105,8 @@ public Color ErrorColor
         /// </summary>
         public string ErrorText
         {
-            get => (string)this.GetValue(ErrorTextProperty);
-            set => this.SetValue(ErrorTextProperty, value);
+            get => (string)GetValue(ErrorTextProperty);
+            set => SetValue(ErrorTextProperty, value);
         }
 
         /// <summary>
@@ -114,8 +114,8 @@ public string ErrorText
         /// </summary>
         public Command<bool> FocusCommand
         {
-            get => (Command<bool>)this.GetValue(FocusCommandProperty);
-            set => this.SetValue(FocusCommandProperty, value);
+            get => (Command<bool>)GetValue(FocusCommandProperty);
+            set => SetValue(FocusCommandProperty, value);
         }
 
         /// <summary>
@@ -123,8 +123,8 @@ public Command<bool> FocusCommand
         /// </summary>
         public bool HasError
         {
-            get => (bool)this.GetValue(HasErrorProperty);
-            set => this.SetValue(HasErrorProperty, value);
+            get => (bool)GetValue(HasErrorProperty);
+            set => SetValue(HasErrorProperty, value);
         }
 
         /// <summary>
@@ -132,8 +132,8 @@ public bool HasError
         /// </summary>
         public string HelperText
         {
-            get => (string)this.GetValue(HelperTextProperty);
-            set => this.SetValue(HelperTextProperty, value);
+            get => (string)GetValue(HelperTextProperty);
+            set => SetValue(HelperTextProperty, value);
         }
 
         /// <summary>
@@ -141,8 +141,8 @@ public string HelperText
         /// </summary>
         public Color HelperTextColor
         {
-            get => (Color)this.GetValue(HelperTextColorProperty);
-            set => this.SetValue(HelperTextColorProperty, value);
+            get => (Color)GetValue(HelperTextColorProperty);
+            set => SetValue(HelperTextColorProperty, value);
         }
 
         /// <summary>
@@ -150,8 +150,8 @@ public Color HelperTextColor
         /// </summary>
         public string HelperTextFontFamily
         {
-            get => (string)this.GetValue(HelperTextFontFamilyProperty);
-            set => this.SetValue(HelperTextFontFamilyProperty, value);
+            get => (string)GetValue(HelperTextFontFamilyProperty);
+            set => SetValue(HelperTextFontFamilyProperty, value);
         }
 
         /// <summary>
@@ -159,8 +159,8 @@ public string HelperTextFontFamily
         /// </summary>
         public string Icon
         {
-            get => (string)this.GetValue(IconProperty);
-            set => this.SetValue(IconProperty, value);
+            get => (string)GetValue(IconProperty);
+            set => SetValue(IconProperty, value);
         }
 
         /// <summary>
@@ -168,8 +168,8 @@ public string Icon
         /// </summary>
         public Color IconTintColor
         {
-            get => (Color)this.GetValue(IconTintColorProperty);
-            set => this.SetValue(IconTintColorProperty, value);
+            get => (Color)GetValue(IconTintColorProperty);
+            set => SetValue(IconTintColorProperty, value);
         }
 
         /// <summary>
@@ -177,8 +177,8 @@ public Color IconTintColor
         /// </summary>
         public MaterialTextFieldInputType InputType
         {
-            get => (MaterialTextFieldInputType)this.GetValue(InputTypeProperty);
-            set => this.SetValue(InputTypeProperty, value);
+            get => (MaterialTextFieldInputType)GetValue(InputTypeProperty);
+            set => SetValue(InputTypeProperty, value);
         }
 
         /// <summary>
@@ -186,8 +186,8 @@ public MaterialTextFieldInputType InputType
         /// </summary>
         public int MaxLength
         {
-            get => (int)this.GetValue(MaxLengthProperty);
-            set => this.SetValue(MaxLengthProperty, value);
+            get => (int)GetValue(MaxLengthProperty);
+            set => SetValue(MaxLengthProperty, value);
         }
 
         /// <summary>
@@ -195,15 +195,15 @@ public int MaxLength
         /// </summary>
         public string Placeholder
         {
-            get => (string)this.GetValue(PlaceholderProperty);
+            get => (string)GetValue(PlaceholderProperty);
             set
             {
                 if (string.IsNullOrWhiteSpace(value))
                 {
-                    throw new ArgumentNullException($"{nameof(this.Placeholder)} must not be null, empty, or a white space.");
+                    throw new ArgumentNullException($"{nameof(Placeholder)} must not be null, empty, or a white space.");
                 }
 
-                this.SetValue(PlaceholderProperty, value);
+                SetValue(PlaceholderProperty, value);
             }
         }
 
@@ -212,8 +212,8 @@ public string Placeholder
         /// </summary>
         public Color PlaceholderColor
         {
-            get => (Color)this.GetValue(PlaceholderColorProperty);
-            set => this.SetValue(PlaceholderColorProperty, value);
+            get => (Color)GetValue(PlaceholderColorProperty);
+            set => SetValue(PlaceholderColorProperty, value);
         }
 
         /// <summary>
@@ -221,8 +221,8 @@ public Color PlaceholderColor
         /// </summary>
         public string PlaceholderFontFamily
         {
-            get => (string)this.GetValue(PlaceholderFontFamilyProperty);
-            set => this.SetValue(PlaceholderFontFamilyProperty, value);
+            get => (string)GetValue(PlaceholderFontFamilyProperty);
+            set => SetValue(PlaceholderFontFamilyProperty, value);
         }
 
         /// <summary>
@@ -230,8 +230,8 @@ public string PlaceholderFontFamily
         /// </summary>
         public ICommand ReturnCommand
         {
-            get => (ICommand)this.GetValue(ReturnCommandProperty);
-            set => this.SetValue(ReturnCommandProperty, value);
+            get => (ICommand)GetValue(ReturnCommandProperty);
+            set => SetValue(ReturnCommandProperty, value);
         }
 
         /// <summary>
@@ -239,8 +239,8 @@ public ICommand ReturnCommand
         /// </summary>
         public object ReturnCommandParameter
         {
-            get => (Command<object>)this.GetValue(ReturnCommandParameterProperty);
-            set => this.SetValue(ReturnCommandParameterProperty, value);
+            get => (Command<object>)GetValue(ReturnCommandParameterProperty);
+            set => SetValue(ReturnCommandParameterProperty, value);
         }
 
         /// <summary>
@@ -248,8 +248,8 @@ public object ReturnCommandParameter
         /// </summary>
         public ReturnType ReturnType
         {
-            get => (ReturnType)this.GetValue(ReturnTypeProperty);
-            set => this.SetValue(ReturnTypeProperty, value);
+            get => (ReturnType)GetValue(ReturnTypeProperty);
+            set => SetValue(ReturnTypeProperty, value);
         }
 
         /// <summary>
@@ -257,21 +257,21 @@ public ReturnType ReturnType
         /// </summary>
         public string Text
         {
-            get => (string)this.GetValue(TextProperty);
+            get => (string)GetValue(TextProperty);
             set
             {
-                if (!string.IsNullOrEmpty(value) && !this.FloatingPlaceholderEnabled)
+                if (!string.IsNullOrEmpty(value) && !FloatingPlaceholderEnabled)
                 {
                     placeholder.IsVisible = false;
                 }
-                else if (string.IsNullOrEmpty(value) && !this.FloatingPlaceholderEnabled)
+                else if (string.IsNullOrEmpty(value) && !FloatingPlaceholderEnabled)
                 {
                     placeholder.IsVisible = true;
                 }
 
-                this.TextChangeCommand?.Execute(value);
-                this.TextChanged?.Invoke(this, new TextChangedEventArgs((string)this.GetValue(TextProperty), value));
-                this.SetValue(TextProperty, value);
+                TextChangeCommand?.Execute(value);
+                TextChanged?.Invoke(this, new TextChangedEventArgs((string)GetValue(TextProperty), value));
+                SetValue(TextProperty, value);
             }
         }
 
@@ -280,8 +280,8 @@ public string Text
         /// </summary>
         public Command<string> TextChangeCommand
         {
-            get => (Command<string>)this.GetValue(TextChangeCommandProperty);
-            set => this.SetValue(TextChangeCommandProperty, value);
+            get => (Command<string>)GetValue(TextChangeCommandProperty);
+            set => SetValue(TextChangeCommandProperty, value);
         }
 
         /// <summary>
@@ -289,8 +289,8 @@ public Command<string> TextChangeCommand
         /// </summary>
         public Color TextColor
         {
-            get => (Color)this.GetValue(TextColorProperty);
-            set => this.SetValue(TextColorProperty, value);
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
         }
 
         /// <summary>
@@ -298,8 +298,8 @@ public Color TextColor
         /// </summary>
         public string TextFontFamily
         {
-            get => (string)this.GetValue(TextFontFamilyProperty);
-            set => this.SetValue(TextFontFamilyProperty, value);
+            get => (string)GetValue(TextFontFamilyProperty);
+            set => SetValue(TextFontFamilyProperty, value);
         }
 
         /// <summary>
@@ -308,8 +308,8 @@ public string TextFontFamily
         /// </summary>
         public Color TintColor
         {
-            get => (Color)this.GetValue(TintColorProperty);
-            set => this.SetValue(TintColorProperty, value);
+            get => (Color)GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
         }
 
         /// <summary>
@@ -317,14 +317,14 @@ public Color TintColor
         /// </summary>
         public Color UnderlineColor
         {
-            get => (Color)this.GetValue(UnderlineColorProperty);
-            set => this.SetValue(UnderlineColorProperty, value);
+            get => (Color)GetValue(UnderlineColorProperty);
+            set => SetValue(UnderlineColorProperty, value);
         }
 
         internal bool FloatingPlaceholderEnabled
         {
-            get => (bool)this.GetValue(FloatingPlaceholderEnabledProperty);
-            set => this.SetValue(FloatingPlaceholderEnabledProperty, value);
+            get => (bool)GetValue(FloatingPlaceholderEnabledProperty);
+            set => SetValue(FloatingPlaceholderEnabledProperty, value);
         }
 
         /// <summary>
@@ -336,11 +336,11 @@ public void ElementChanged(bool created)
         {
             if (created)
             {
-                entry.PropertyChanged += this.Entry_PropertyChanged;
+                entry.PropertyChanged += Entry_PropertyChanged;
             }
             else
             {
-                entry.PropertyChanged -= this.Entry_PropertyChanged;
+                entry.PropertyChanged -= Entry_PropertyChanged;
             }
         }
 
@@ -348,14 +348,14 @@ protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
 
-            this.AnimatePlaceHolderOnStart(this.BindingContext);
+            AnimatePlaceHolderOnStart(BindingContext);
         }
 
         protected override void OnParentSet()
         {
             base.OnParentSet();
 
-            this.AnimatePlaceHolderOnStart(this.Parent);
+            AnimatePlaceHolderOnStart(Parent);
         }
 
         /// <summary>
@@ -366,7 +366,7 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         {
             base.OnPropertyChanged(propertyName);
 
-            if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(propertyName, out Action handlePropertyChange))
+            if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(propertyName, out var handlePropertyChange))
             {
                 handlePropertyChange();
             }
@@ -378,10 +378,10 @@ private void AnimatePlaceHolder()
             var endFOnt = entry.IsFocused ? 12 : 16;
             var startY = placeholder.TranslationY;
             var endY = entry.IsFocused ? -20 : 0;
-            var color = entry.IsFocused ? this.TintColor : this.PlaceholderColor;
-            Animation anim = new Animation();
+            var color = entry.IsFocused ? TintColor : PlaceholderColor;
+            var anim = new Animation();
 
-            if (this.FloatingPlaceholderEnabled)
+            if (FloatingPlaceholderEnabled)
             {
                 anim = new Animation
                 {
@@ -393,14 +393,14 @@ private void AnimatePlaceHolder()
                     {
                         0.0,
                         AnimationDuration,
-                        new Animation(v => placeholder.TranslationY = v, startY, endY, animationCurve, () => placeholder.TextColor = this.HasError && entry.IsFocused ? this.ErrorColor : color)
+                        new Animation(v => placeholder.TranslationY = v, startY, endY, animationCurve, () => placeholder.TextColor = HasError && entry.IsFocused ? ErrorColor : color)
                     }
                 };
             }
 
             if (entry.IsFocused)
             {
-                anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, this.Width, animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
+                anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, Width, animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
             }
             else
             {
@@ -417,25 +417,25 @@ private void AnimatePlaceHolder()
 
         private void AnimatePlaceHolderOnStart(object startObject)
         {
-            if (startObject != null && !string.IsNullOrEmpty(this.Text) && !_wasFocused)
+            if (startObject != null && !string.IsNullOrEmpty(Text) && !_wasFocused)
             {
                 Device.BeginInvokeOnMainThread(async () =>
                 {
                     await Task.Delay(250);
                     var anim = new Animation();
 
-                    if (this.FloatingPlaceholderEnabled)
+                    if (FloatingPlaceholderEnabled)
                     {
                         entry.Opacity = 0;
                         anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.FontSize = v, 16, 12, animationCurve));
                         anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.TranslationY = v, placeholder.TranslationY, -12, animationCurve, () =>
                         {
-                            placeholder.TextColor = this.TintColor;
+                            placeholder.TextColor = TintColor;
                             entry.Opacity = 1;
                         }));
                     }
 
-                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, this.Width, animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
+                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, Width, animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
                     anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: animationCurve);
                 });
             }
@@ -445,11 +445,11 @@ private async Task ChangeToErrorState()
         {
             const int animDuration = 250;
             var shakeAnimTask = Task.CompletedTask;
-            placeholder.TextColor = string.IsNullOrEmpty(this.Text) ? this.PlaceholderColor : this.ErrorColor;
-            counter.TextColor = this.ErrorColor;
-            underline.Color = this.ErrorColor;
+            placeholder.TextColor = string.IsNullOrEmpty(Text) ? PlaceholderColor : ErrorColor;
+            counter.TextColor = ErrorColor;
+            underline.Color = ErrorColor;
 
-            if (!string.IsNullOrEmpty(this.Text))
+            if (!string.IsNullOrEmpty(Text))
             {
                 shakeAnimTask = Task.Run(() =>
                 {
@@ -471,8 +471,8 @@ await Task.WhenAll
                     Device.BeginInvokeOnMainThread(async () =>
                     {
                         helper.TranslationY = -4;
-                        helper.TextColor = this.ErrorColor;
-                        helper.Text = this.ErrorText;
+                        helper.TextColor = ErrorColor;
+                        helper.Text = ErrorText;
                         await Task.WhenAll(helper.FadeTo(1, animDuration / 2, animationCurve), helper.TranslateTo(0, 0, animDuration / 2, animationCurve));
                     });
                 }),
@@ -483,7 +483,7 @@ await Task.WhenAll
         private void ChangeToNormalState()
         {
             const double opactiy = 1;
-            this.IsEnabled = true;
+            IsEnabled = true;
             entry.Opacity = opactiy;
             placeholder.Opacity = opactiy;
             helper.Opacity = opactiy;
@@ -491,14 +491,14 @@ private void ChangeToNormalState()
 
             Device.BeginInvokeOnMainThread(async () =>
             {
-                var accentColor = this.TintColor;
+                var accentColor = TintColor;
                 placeholder.TextColor = accentColor;
-                counter.TextColor = this.HelperTextColor;
+                counter.TextColor = HelperTextColor;
                 underline.Color = accentColor;
                 await helper.FadeTo(0, 150, animationCurve);
                 helper.TranslationY = -4;
-                helper.TextColor = this.HelperTextColor;
-                helper.Text = this.HelperText;
+                helper.TextColor = HelperTextColor;
+                helper.Text = HelperText;
                 await Task.WhenAll(helper.FadeTo(1, 150, animationCurve), helper.TranslateTo(0, 0, 150, animationCurve));
             });
         }
@@ -508,26 +508,26 @@ private void Entry_PropertyChanged(object sender, System.ComponentModel.Property
             if (e.PropertyName == nameof(Entry.IsFocused))
             {
                 _wasFocused = true;
-                this.FocusCommand?.Execute(entry.IsFocused);
-                this.Focused?.Invoke(this, new FocusEventArgs(entry, entry.IsFocused));
-                this.UpdateCounter();
+                FocusCommand?.Execute(entry.IsFocused);
+                Focused?.Invoke(this, new FocusEventArgs(entry, entry.IsFocused));
+                UpdateCounter();
             }
 
             if (e.PropertyName == nameof(Entry.IsFocused) && string.IsNullOrEmpty(entry.Text))
             {
-                this.AnimatePlaceHolder();
+                AnimatePlaceHolder();
             }
             else if (e.PropertyName == nameof(Entry.Text))
             {
-                this.Text = entry.Text;
-                this.UpdateCounter();
+                Text = entry.Text;
+                UpdateCounter();
             }
         }
 
         private void OnAlwaysShowUnderlineChanged(bool isShown)
         {
             persistentUnderline.IsVisible = isShown;
-            persistentUnderline.Color = this.UnderlineColor.MultiplyAlpha(0.6);
+            persistentUnderline.Color = UnderlineColor.MultiplyAlpha(0.6);
         }
 
         private void OnBackgroundColorChanged(Color backgroundColor)
@@ -537,8 +537,8 @@ private void OnBackgroundColorChanged(Color backgroundColor)
 
         private void OnEnabledChanged(bool isEnabled)
         {
-            this.Opacity = isEnabled ? 1 : 0.33;
-            helper.IsVisible = isEnabled && !string.IsNullOrEmpty(this.HelperText);
+            Opacity = isEnabled ? 1 : 0.33;
+            helper.IsVisible = isEnabled && !string.IsNullOrEmpty(HelperText);
         }
 
         private void OnErrorColorChanged(Color errorColor)
@@ -548,9 +548,9 @@ private void OnErrorColorChanged(Color errorColor)
 
         private async Task OnErrorTextChanged()
         {
-            if (this.HasError)
+            if (HasError)
             {
-                await this.ChangeToErrorState();
+                await ChangeToErrorState();
             }
         }
 
@@ -558,13 +558,13 @@ private async Task OnHasErrorChanged(bool hasError)
         {
             errorIcon.IsVisible = hasError;
 
-            if (this.HasError)
+            if (HasError)
             {
-                await this.ChangeToErrorState();
+                await ChangeToErrorState();
             }
             else
             {
-                this.ChangeToNormalState();
+                ChangeToNormalState();
             }
         }
 
@@ -588,7 +588,7 @@ private void OnIconChanged(string source)
         {
             icon.IsVisible = !string.IsNullOrEmpty(source);
             icon.Source = source;
-            icon.TintColor = this.IconTintColor;
+            icon.TintColor = IconTintColor;
         }
 
         private void OnIconTintColorChanged(Color tintColor)
@@ -683,8 +683,8 @@ private void OnReturnTypeChangedd(ReturnType returnType)
         private void OnTextChanged(string text)
         {
             entry.Text = text;
-            this.AnimatePlaceHolderOnStart(this);
-            this.UpdateCounter();
+            AnimatePlaceHolderOnStart(this);
+            UpdateCounter();
         }
 
         private void OnTextColorChanged(Color textColor)
@@ -704,7 +704,7 @@ private void OnTintColorChanged(Color tintColor)
 
         private void OnUnderlineColorChanged(Color underlineColor)
         {
-            if (this.AlwaysShowUnderline)
+            if (AlwaysShowUnderline)
             {
                 persistentUnderline.Color = underlineColor.MultiplyAlpha(0.6);
             }
@@ -712,8 +712,8 @@ private void OnUnderlineColorChanged(Color underlineColor)
 
         private void SetControl()
         {
-            errorIcon.TintColor = this.ErrorColor;
-            persistentUnderline.Color = this.UnderlineColor;
+            errorIcon.TintColor = ErrorColor;
+            persistentUnderline.Color = UnderlineColor;
             tapGesture.Command = new Command(() =>
             {
                 if (!entry.IsFocused)
@@ -727,30 +727,30 @@ private void SetPropertyChangeHandler(ref Dictionary<string, Action> propertyCha
         {
             propertyChangeActions = new Dictionary<string, Action>
             {
-                { nameof(this.Text), () => this.OnTextChanged(this.Text) },
-                { nameof(this.TextColor), () => this.OnTextColorChanged(this.TextColor) },
-                { nameof(this.TextFontFamily), () => this.OnTextFontFamilyChanged(this.TextFontFamily) },
-                { nameof(this.TintColor), () => this.OnTintColorChanged(this.TintColor) },
-                { nameof(this.Placeholder), () => this.OnPlaceholderChanged(this.Placeholder) },
-                { nameof(this.PlaceholderColor), () => this.OnPlaceholderColorChanged(this.PlaceholderColor) },
-                { nameof(this.PlaceholderFontFamily), () => this.OnPlaceholderFontFamilyChanged(this.PlaceholderFontFamily) },
-                { nameof(this.HelperText), () => this.OnHelperTextChanged(this.HelperText) },
-                { nameof(this.HelperTextFontFamily), () => this.OnHelpertTextFontFamilyChanged(this.HelperTextFontFamily) },
-                { nameof(this.HelperTextColor), () => this.OnHelperTextColorChanged(this.HelperTextColor) },
-                { nameof(this.InputType), () => this.OnInputTypeChanged(this.InputType) },
-                { nameof(this.IsEnabled), () => this.OnEnabledChanged(this.IsEnabled) },
-                { nameof(this.BackgroundColor), () => this.OnBackgroundColorChanged(this.BackgroundColor) },
-                { nameof(this.AlwaysShowUnderline), () => this.OnAlwaysShowUnderlineChanged(this.AlwaysShowUnderline) },
-                { nameof(this.MaxLength), () => this.OnMaxLengthChanged(this.MaxLength) },
-                { nameof(this.Icon), () => this.OnIconChanged(this.Icon) },
-                { nameof(this.IconTintColor), () => this.OnIconTintColorChanged(this.IconTintColor) },
-                { nameof(this.ReturnCommand), () => this.OnReturnCommandChanged(this.ReturnCommand) },
-                { nameof(this.ReturnCommandParameter), () => this.OnReturnCommandParameterChanged(this.ReturnCommandParameter) },
-                { nameof(this.ReturnType), () => this.OnReturnTypeChangedd(this.ReturnType) },
-                { nameof(this.ErrorColor), () => this.OnErrorColorChanged(this.ErrorColor) },
-                { nameof(this.UnderlineColor), () => this.OnUnderlineColorChanged(this.UnderlineColor) },
-                { nameof(this.ErrorText), async () => await this.OnErrorTextChanged() },
-                { nameof(this.HasError), async () => await this.OnHasErrorChanged(this.HasError) },
+                { nameof(Text), () => OnTextChanged(Text) },
+                { nameof(TextColor), () => OnTextColorChanged(TextColor) },
+                { nameof(TextFontFamily), () => OnTextFontFamilyChanged(TextFontFamily) },
+                { nameof(TintColor), () => OnTintColorChanged(TintColor) },
+                { nameof(Placeholder), () => OnPlaceholderChanged(Placeholder) },
+                { nameof(PlaceholderColor), () => OnPlaceholderColorChanged(PlaceholderColor) },
+                { nameof(PlaceholderFontFamily), () => OnPlaceholderFontFamilyChanged(PlaceholderFontFamily) },
+                { nameof(HelperText), () => OnHelperTextChanged(HelperText) },
+                { nameof(HelperTextFontFamily), () => OnHelpertTextFontFamilyChanged(HelperTextFontFamily) },
+                { nameof(HelperTextColor), () => OnHelperTextColorChanged(HelperTextColor) },
+                { nameof(InputType), () => OnInputTypeChanged(InputType) },
+                { nameof(IsEnabled), () => OnEnabledChanged(IsEnabled) },
+                { nameof(BackgroundColor), () => OnBackgroundColorChanged(BackgroundColor) },
+                { nameof(AlwaysShowUnderline), () => OnAlwaysShowUnderlineChanged(AlwaysShowUnderline) },
+                { nameof(MaxLength), () => OnMaxLengthChanged(MaxLength) },
+                { nameof(Icon), () => OnIconChanged(Icon) },
+                { nameof(IconTintColor), () => OnIconTintColorChanged(IconTintColor) },
+                { nameof(ReturnCommand), () => OnReturnCommandChanged(ReturnCommand) },
+                { nameof(ReturnCommandParameter), () => OnReturnCommandParameterChanged(ReturnCommandParameter) },
+                { nameof(ReturnType), () => OnReturnTypeChangedd(ReturnType) },
+                { nameof(ErrorColor), () => OnErrorColorChanged(ErrorColor) },
+                { nameof(UnderlineColor), () => OnUnderlineColorChanged(UnderlineColor) },
+                { nameof(ErrorText), async () => await OnErrorTextChanged() },
+                { nameof(HasError), async () => await OnHasErrorChanged(HasError) },
             };
         }
 
@@ -759,7 +759,7 @@ private void UpdateCounter()
             if (_counterEnabled)
             {
                 var count = entry.Text != null ? entry.Text.Length : 0;
-                counter.Text = entry.IsFocused ? $"{count}/{this.MaxLength}" : string.Empty;
+                counter.Text = entry.IsFocused ? $"{count}/{MaxLength}" : string.Empty;
             }
         }
     }
diff --git a/XF.Material/UI/Internals/MaterialSelectionControlModel.cs b/XF.Material/UI/Internals/MaterialSelectionControlModel.cs
index a33630d1..26564177 100644
--- a/XF.Material/UI/Internals/MaterialSelectionControlModel.cs
+++ b/XF.Material/UI/Internals/MaterialSelectionControlModel.cs
@@ -10,96 +10,96 @@ internal class MaterialSelectionControlModel : PropertyChangeAware
         public int Index
         {
             get => _index;
-            set => this.Set(ref _index, value);
+            set => Set(ref _index, value);
         }
 
         private string _text;
         public string Text
         {
             get => _text;
-            set => this.Set(ref _text, value);
+            set => Set(ref _text, value);
         }
 
         private bool _isSelected;
         public bool IsSelected
         {
             get => _isSelected;
-            set => this.Set(ref _isSelected, value);
+            set => Set(ref _isSelected, value);
         }
 
         private double _horizontalSpacing;
         public double HorizontalSpacing
         {
             get => _horizontalSpacing;
-            set => this.Set(ref _horizontalSpacing, value);
+            set => Set(ref _horizontalSpacing, value);
         }
 
         private Command<bool> _selectedChangeCommand;
         public Command<bool> SelectedChangeCommand
         {
             get => _selectedChangeCommand;
-            set => this.Set(ref _selectedChangeCommand, value);
+            set => Set(ref _selectedChangeCommand, value);
         }
 
         private string _fontFamily;
         public string FontFamily
         {
             get => _fontFamily;
-            set => this.Set(ref _fontFamily, value);
+            set => Set(ref _fontFamily, value);
         }
 
         private double _fontSize;
         public double FontSize
         {
             get => _fontSize;
-            set => this.Set(ref _fontSize, value);
+            set => Set(ref _fontSize, value);
         }
 
         private Color _selectedColor;
         public Color SelectedColor
         {
             get => _selectedColor;
-            set => this.Set(ref _selectedColor, value);
+            set => Set(ref _selectedColor, value);
         }
 
         private Color _unselectedColor;
         public Color UnselectedColor
         {
             get => _unselectedColor;
-            set => this.Set(ref _unselectedColor, value);
+            set => Set(ref _unselectedColor, value);
         }
 
         private Color _textColor;
         public Color TextColor
         {
             get => _textColor;
-            set => this.Set(ref _textColor, value);
+            set => Set(ref _textColor, value);
         }
 
         private double _verticalSpacing;
         public double VerticalSpacing
         {
             get => _verticalSpacing;
-            set => this.Set(ref _verticalSpacing, value);
+            set => Set(ref _verticalSpacing, value);
         }
 
         private bool _canBeUnselected = true;
         public bool CanBeUnselected
         {
             get => _canBeUnselected;
-            set => this.Set(ref _canBeUnselected, value);
+            set => Set(ref _canBeUnselected, value);
         }
 
         public override int GetHashCode()
         {
-            return this.Index;
+            return Index;
         }
 
         public override bool Equals(object obj)
         {
             if (obj is MaterialSelectionControlModel model)
             {
-                return this.Index == model.Index;
+                return Index == model.Index;
             }
 
             return false;
diff --git a/XF.Material/UI/Internals/MenuDialogLabel.cs b/XF.Material/UI/Internals/MenuDialogLabel.cs
index e20d9f5e..73d0310e 100644
--- a/XF.Material/UI/Internals/MenuDialogLabel.cs
+++ b/XF.Material/UI/Internals/MenuDialogLabel.cs
@@ -12,21 +12,21 @@ internal class MenuDialogLabel : MaterialLabel
 
         public ICommand SizeChangeCommand
         {
-            get => (ICommand)this.GetValue(SizeChangeCommandProperty);
-            set => this.SetValue(SizeChangeCommandProperty, value);
+            get => (ICommand)GetValue(SizeChangeCommandProperty);
+            set => SetValue(SizeChangeCommandProperty, value);
         }
 
-        public MenuDialogLabel() => this.SizeChanged += this.MenuDialogLabel_SizeChanged;
+        public MenuDialogLabel() => SizeChanged += MenuDialogLabel_SizeChanged;
 
         private void MenuDialogLabel_SizeChanged(object sender, EventArgs e)
         {
-            this.SizeChangeCommand?.Execute(new Dictionary<string, object>
+            SizeChangeCommand?.Execute(new Dictionary<string, object>
             {
-                {"width", this.Width },
-                {"parameter", Convert.ToInt32(this.GetValue(MaterialMenuDialog.ParameterProperty)) }
+                {"width", Width },
+                {"parameter", Convert.ToInt32(GetValue(MaterialMenuDialog.ParameterProperty)) }
             });
 
-            this.SizeChanged -= this.MenuDialogLabel_SizeChanged;
+            SizeChanged -= MenuDialogLabel_SizeChanged;
         }
     }
 }
diff --git a/XF.Material/UI/Internals/NullableDateChangedEventArgs.cs b/XF.Material/UI/Internals/NullableDateChangedEventArgs.cs
index f33bf2b5..015dc8ca 100644
--- a/XF.Material/UI/Internals/NullableDateChangedEventArgs.cs
+++ b/XF.Material/UI/Internals/NullableDateChangedEventArgs.cs
@@ -6,8 +6,8 @@ public class NullableDateChangedEventArgs : EventArgs
     {
         public NullableDateChangedEventArgs(DateTime? oldDate, DateTime? newDate)
         {
-            this.OldDate = oldDate;
-            this.NewDate = newDate;
+            OldDate = oldDate;
+            NewDate = newDate;
         }
 
         public DateTime? OldDate { get; set; }
diff --git a/XF.Material/UI/MaterialButton.cs b/XF.Material/UI/MaterialButton.cs
index 90b38d0e..f66f63bf 100644
--- a/XF.Material/UI/MaterialButton.cs
+++ b/XF.Material/UI/MaterialButton.cs
@@ -17,7 +17,7 @@ public class MaterialButton : Button, IMaterialButtonControl
 
         public static readonly BindableProperty AllCapsProperty = BindableProperty.Create(nameof(AllCaps), typeof(bool), typeof(MaterialButton), true);
 
-        public new static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(MaterialButton), Material.Color.Secondary);
+        public static new readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(MaterialButton), Material.Color.Secondary);
 
         public static readonly BindableProperty ButtonTypeProperty = BindableProperty.Create(nameof(ButtonType), typeof(MaterialButtonType), typeof(MaterialButton), MaterialButtonType.Elevated);
 
@@ -33,20 +33,20 @@ public class MaterialButton : Button, IMaterialButtonControl
 
         public MaterialButton()
         {
-            this.SetDynamicResource(FontFamilyProperty, MaterialConstants.FontFamily.BUTTON);
-            this.SetDynamicResource(FontSizeProperty, MaterialConstants.MATERIAL_FONTSIZE_BUTTON);
-            this.SetDynamicResource(FontAttributesProperty, MaterialConstants.MATERIAL_FONTATTRIBUTE_BOLD);
-            this.SetDynamicResource(CornerRadiusProperty, MaterialConstants.MATERIAL_BUTTON_CORNERRADIUS);
-            this.SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.SECONDARY);
-            this.SetDynamicResource(TextColorProperty, MaterialConstants.Color.ON_SECONDARY);
-            this.SetDynamicResource(HeightRequestProperty, MaterialConstants.MATERIAL_BUTTON_HEIGHT);
-            this.SetDynamicResource(FontAttributesProperty, MaterialConstants.MATERIAL_FONTATTRIBUTE_BOLD);
+            SetDynamicResource(FontFamilyProperty, MaterialConstants.FontFamily.BUTTON);
+            SetDynamicResource(FontSizeProperty, MaterialConstants.MATERIAL_FONTSIZE_BUTTON);
+            SetDynamicResource(FontAttributesProperty, MaterialConstants.MATERIAL_FONTATTRIBUTE_BOLD);
+            SetDynamicResource(CornerRadiusProperty, MaterialConstants.MATERIAL_BUTTON_CORNERRADIUS);
+            SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.SECONDARY);
+            SetDynamicResource(TextColorProperty, MaterialConstants.Color.ON_SECONDARY);
+            SetDynamicResource(HeightRequestProperty, MaterialConstants.MATERIAL_BUTTON_HEIGHT);
+            SetDynamicResource(FontAttributesProperty, MaterialConstants.MATERIAL_FONTATTRIBUTE_BOLD);
         }
 
         public MaterialElevation Elevation
         {
-            get => (MaterialElevation)this.GetValue(ElevationProperty);
-            set => this.SetValue(ElevationProperty, value);
+            get => (MaterialElevation)GetValue(ElevationProperty);
+            set => SetValue(ElevationProperty, value);
         }
 
         /// <summary>
@@ -54,8 +54,8 @@ public MaterialElevation Elevation
         /// </summary>
         public bool AllCaps
         {
-            get => (bool)this.GetValue(AllCapsProperty);
-            set => this.SetValue(AllCapsProperty, value);
+            get => (bool)GetValue(AllCapsProperty);
+            set => SetValue(AllCapsProperty, value);
         }
 
         /// <summary>
@@ -63,8 +63,8 @@ public bool AllCaps
         /// </summary>
         public double LetterSpacing
         {
-            get => (double)this.GetValue(LetterSpacingProperty);
-            set => this.SetValue(LetterSpacingProperty, value);
+            get => (double)GetValue(LetterSpacingProperty);
+            set => SetValue(LetterSpacingProperty, value);
         }
 
         /// <summary>
@@ -72,8 +72,8 @@ public double LetterSpacing
         /// </summary>
         public new Color BackgroundColor
         {
-            get => (Color)this.GetValue(BackgroundColorProperty);
-            set => this.SetValue(BackgroundColorProperty, value);
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
         }
 
         /// <summary>
@@ -81,20 +81,20 @@ public double LetterSpacing
         /// </summary>
         public virtual MaterialButtonType ButtonType
         {
-            get => (MaterialButtonType)this.GetValue(ButtonTypeProperty);
-            set => this.SetValue(ButtonTypeProperty, value);
+            get => (MaterialButtonType)GetValue(ButtonTypeProperty);
+            set => SetValue(ButtonTypeProperty, value);
         }
 
         public Color DisabledBackgroundColor
         {
-            get => (Color)this.GetValue(DisabledBackgroundColorProperty);
-            set => this.SetValue(DisabledBackgroundColorProperty, value);
+            get => (Color)GetValue(DisabledBackgroundColorProperty);
+            set => SetValue(DisabledBackgroundColorProperty, value);
         }
 
         public Color PressedBackgroundColor
         {
-            get => (Color)this.GetValue(PressedBackgroundColorProperty);
-            set => this.SetValue(PressedBackgroundColorProperty, value);
+            get => (Color)GetValue(PressedBackgroundColorProperty);
+            set => SetValue(PressedBackgroundColorProperty, value);
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
@@ -109,11 +109,11 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
                 switch (propertyName)
                 {
-                    case nameof(this.ButtonType):
-                        this.ButtonTypeChanged(this.ButtonType);
+                    case nameof(ButtonType):
+                        ButtonTypeChanged(ButtonType);
                         break;
-                    case nameof(this.Style):
-                        this.SetStyleValues(this.Style);
+                    case nameof(Style):
+                        SetStyleValues(Style);
                         break;
                 }
             }
@@ -125,31 +125,31 @@ private void SetStyleValues(Style style)
             {
                 if (s.Value is DynamicResource d)
                 {
-                    this.SetDynamicResource(s.Property, d.Key);
+                    SetDynamicResource(s.Property, d.Key);
                 }
                 else
                 {
-                    this.SetValue(s.Property, s.Value);
+                    SetValue(s.Property, s.Value);
                 }
             });
         }
 
         private void ButtonTypeChanged(MaterialButtonType buttonType)
         {
-            if (buttonType == MaterialButtonType.Outlined && this.BorderColor.IsDefault)
+            if (buttonType == MaterialButtonType.Outlined && BorderColor.IsDefault)
             {
-                this.BorderColor = OutlinedBorderColor;
+                BorderColor = OutlinedBorderColor;
             }
 
-            if (buttonType == MaterialButtonType.Outlined && this.BorderWidth == (double)BorderWidthProperty.DefaultValue)
+            if (buttonType == MaterialButtonType.Outlined && BorderWidth == (double)BorderWidthProperty.DefaultValue)
             {
-                this.BorderWidth = 1;
+                BorderWidth = 1;
             }
 
             if (buttonType == MaterialButtonType.Text || buttonType == MaterialButtonType.Outlined)
             {
-                this.RemoveDynamicResource(TextColorProperty);
-                this.SetDynamicResource(TextColorProperty, MaterialConstants.Color.SECONDARY);
+                RemoveDynamicResource(TextColorProperty);
+                SetDynamicResource(TextColorProperty, MaterialConstants.Color.SECONDARY);
             }
         }
     }
diff --git a/XF.Material/UI/MaterialCard.cs b/XF.Material/UI/MaterialCard.cs
index e62aa90c..d03118c8 100644
--- a/XF.Material/UI/MaterialCard.cs
+++ b/XF.Material/UI/MaterialCard.cs
@@ -38,7 +38,7 @@ public class MaterialCard : Frame
         /// </summary>
         public MaterialCard()
         {
-            this.SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.SURFACE);
+            SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.SURFACE);
         }
 
         /// <summary>
@@ -51,8 +51,8 @@ public MaterialCard()
         /// </summary>
         public ICommand ClickCommand
         {
-            get => (ICommand)this.GetValue(ClickCommandProperty);
-            set => this.SetValue(ClickCommandProperty, value);
+            get => (ICommand)GetValue(ClickCommandProperty);
+            set => SetValue(ClickCommandProperty, value);
         }
 
         /// <summary>
@@ -60,8 +60,8 @@ public ICommand ClickCommand
         /// </summary>
         public object ClickCommandParameter
         {
-            get => this.GetValue(ClickCommandParameterProperty);
-            set => this.SetValue(ClickCommandParameterProperty, value);
+            get => GetValue(ClickCommandParameterProperty);
+            set => SetValue(ClickCommandParameterProperty, value);
         }
 
         /// <summary>
@@ -69,8 +69,8 @@ public object ClickCommandParameter
         /// </summary>
         public int Elevation
         {
-            get => (int)this.GetValue(ElevationProperty);
-            set => this.SetValue(ElevationProperty, value);
+            get => (int)GetValue(ElevationProperty);
+            set => SetValue(ElevationProperty, value);
         }
 
         /// <summary>
@@ -78,28 +78,28 @@ public int Elevation
         /// </summary>
         public bool IsClickable
         {
-            get => (bool)this.GetValue(IsClickableProperty);
-            set => this.SetValue(IsClickableProperty, value);
+            get => (bool)GetValue(IsClickableProperty);
+            set => SetValue(IsClickableProperty, value);
         }
 
         protected virtual void OnClick()
         {
-            this.Clicked?.Invoke(this, EventArgs.Empty);
-            this.ClickCommand?.Execute(this.ClickCommandParameter);
+            Clicked?.Invoke(this, EventArgs.Empty);
+            ClickCommand?.Execute(ClickCommandParameter);
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            if (propertyName == nameof(this.HasShadow))
+            if (propertyName == nameof(HasShadow))
             {
                 return;
             }
 
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == nameof(this.IsClickable))
+            if (propertyName == nameof(IsClickable))
             {
-                this.OnIsClickableChanged(this.IsClickable);
+                OnIsClickableChanged(IsClickable);
             }
         }
 
@@ -111,15 +111,15 @@ private void OnIsClickableChanged(bool isClickable)
                 {
                     _tapGestureRecognizer = new TapGestureRecognizer
                     {
-                        Command = new Command(this.OnClick)
+                        Command = new Command(OnClick)
                     };
                 }
 
-                this.GestureRecognizers.Add(_tapGestureRecognizer);
+                GestureRecognizers.Add(_tapGestureRecognizer);
             }
             else
             {
-                this.GestureRecognizers.Remove(_tapGestureRecognizer);
+                GestureRecognizers.Remove(_tapGestureRecognizer);
             }
         }
     }
diff --git a/XF.Material/UI/MaterialCheckboxGroup.xaml.cs b/XF.Material/UI/MaterialCheckboxGroup.xaml.cs
index 4eab584e..9cbd7d09 100644
--- a/XF.Material/UI/MaterialCheckboxGroup.xaml.cs
+++ b/XF.Material/UI/MaterialCheckboxGroup.xaml.cs
@@ -33,7 +33,7 @@ public partial class MaterialCheckboxGroup : BaseMaterialSelectionControlGroup
         /// </summary>
         public MaterialCheckboxGroup()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         /// <summary>
@@ -42,8 +42,8 @@ public MaterialCheckboxGroup()
         /// <param name="choices">The list of string which the user will choose from.</param>
         public MaterialCheckboxGroup(IList<string> choices)
         {
-            this.InitializeComponent();
-            this.Choices = choices;
+            InitializeComponent();
+            Choices = choices;
         }
 
         /// <summary>
@@ -56,8 +56,8 @@ public MaterialCheckboxGroup(IList<string> choices)
         /// </summary>
         public IList<int> SelectedIndices
         {
-            get => (IList<int>)this.GetValue(SelectedIndicesProperty);
-            set => this.SetValue(SelectedIndicesProperty, value);
+            get => (IList<int>)GetValue(SelectedIndicesProperty);
+            set => SetValue(SelectedIndicesProperty, value);
         }
 
         /// <summary>
@@ -65,28 +65,28 @@ public IList<int> SelectedIndices
         /// </summary>
         public Command<int[]> SelectedIndicesChangedCommand
         {
-            get => (Command<int[]>)this.GetValue(SelectedIndicesChangedCommandProperty);
-            set => this.SetValue(SelectedIndicesChangedCommandProperty, value);
+            get => (Command<int[]>)GetValue(SelectedIndicesChangedCommandProperty);
+            set => SetValue(SelectedIndicesChangedCommandProperty, value);
         }
 
         protected override void CreateChoices()
         {
             var models = new ObservableCollection<MaterialSelectionControlModel>();
 
-            for (var i = 0; i < this.Choices.Count; i++)
+            for (var i = 0; i < Choices.Count; i++)
             {
                 var i1 = i;
                 var model = new MaterialSelectionControlModel
                 {
-                    SelectedChangeCommand = new Command<bool>((isSelected) => this.CheckboxSelected(isSelected, i1)),
-                    Text = this.Choices[i],
-                    HorizontalSpacing = this.HorizontalSpacing,
-                    FontFamily = this.FontFamily,
-                    FontSize = this.FontSize,
-                    SelectedColor = this.SelectedColor,
-                    UnselectedColor = this.UnselectedColor,
-                    TextColor = this.TextColor,
-                    VerticalSpacing = this.VerticalSpacing
+                    SelectedChangeCommand = new Command<bool>((isSelected) => CheckboxSelected(isSelected, i1)),
+                    Text = Choices[i],
+                    HorizontalSpacing = HorizontalSpacing,
+                    FontFamily = FontFamily,
+                    FontSize = FontSize,
+                    SelectedColor = SelectedColor,
+                    UnselectedColor = UnselectedColor,
+                    TextColor = TextColor,
+                    VerticalSpacing = VerticalSpacing
                 };
 
                 models.Add(model);
@@ -101,23 +101,23 @@ protected override void CreateChoices()
         /// <param name="selectedIndices">The collection of new selected indices.</param>
         protected virtual void OnSelectedIndicesChanged(IList<int> selectedIndices)
         {
-            this.SelectedIndicesChangedCommand?.Execute(selectedIndices.ToArray());
-            this.SelectedIndicesChanged?.Invoke(this, new SelectedIndicesChangedEventArgs(selectedIndices.ToArray()));
+            SelectedIndicesChangedCommand?.Execute(selectedIndices.ToArray());
+            SelectedIndicesChanged?.Invoke(this, new SelectedIndicesChangedEventArgs(selectedIndices.ToArray()));
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == nameof(this.SelectedIndices))
+            if (propertyName == nameof(SelectedIndices))
             {
-                this.OnSelectedIndicesChanged();
+                OnSelectedIndicesChanged();
             }
         }
 
         private void OnSelectedIndicesChanged()
         {
-            switch (this.SelectedIndices)
+            switch (SelectedIndices)
             {
                 case null:
                     throw new InvalidOperationException("The property 'SelectedIndices' was assigned with a null value.");
@@ -125,9 +125,9 @@ private void OnSelectedIndicesChanged()
                     throw new InvalidOperationException("The property 'SelectedIndices' is 'System.Array', please use a collection that has no fixed size");
                 default:
                     {
-                        if (!this.SelectedIndices.Any())
+                        if (!SelectedIndices.Any())
                         {
-                            foreach (var model in this.Models)
+                            foreach (var model in Models)
                             {
                                 model.IsSelected = false;
                             }
@@ -135,9 +135,9 @@ private void OnSelectedIndicesChanged()
 
                         else
                         {
-                            foreach (var index in this.SelectedIndices)
+                            foreach (var index in SelectedIndices)
                             {
-                                var model = this.Models.ElementAt(index);
+                                var model = Models.ElementAt(index);
                                 model.IsSelected = true;
                             }
                         }
@@ -146,23 +146,23 @@ private void OnSelectedIndicesChanged()
                     }
             }
 
-            this.OnSelectedIndicesChanged(this.SelectedIndices);
+            OnSelectedIndicesChanged(SelectedIndices);
         }
 
         private void CheckboxSelected(bool isSelected, int index)
         {
             try
             {
-                if (isSelected && this.SelectedIndices.All(s => s != index))
+                if (isSelected && SelectedIndices.All(s => s != index))
                 {
-                    this.SelectedIndices.Add(index);
-                    this.OnSelectedIndicesChanged(this.SelectedIndices);
+                    SelectedIndices.Add(index);
+                    OnSelectedIndicesChanged(SelectedIndices);
                 }
 
-                else if (!isSelected && this.SelectedIndices.Any(s => s == index))
+                else if (!isSelected && SelectedIndices.Any(s => s == index))
                 {
-                    this.SelectedIndices.Remove(index);
-                    this.OnSelectedIndicesChanged(this.SelectedIndices);
+                    SelectedIndices.Remove(index);
+                    OnSelectedIndicesChanged(SelectedIndices);
                 }
             }
 
diff --git a/XF.Material/UI/MaterialChip.xaml.cs b/XF.Material/UI/MaterialChip.xaml.cs
index 4e1614bd..2a3fc692 100644
--- a/XF.Material/UI/MaterialChip.xaml.cs
+++ b/XF.Material/UI/MaterialChip.xaml.cs
@@ -12,7 +12,7 @@ public partial class MaterialChip : ContentView
         public static readonly BindableProperty ActionImageProperty = BindableProperty.Create(nameof(ActionImage), typeof(ImageSource), typeof(MaterialChip), default(ImageSource));
         public static readonly BindableProperty ActionImageTappedCommandProperty = BindableProperty.Create(nameof(ActionImageTappedCommand), typeof(ICommand), typeof(MaterialChip), default(Command));
         public static readonly BindableProperty ActionImageTintColorProperty = BindableProperty.Create(nameof(ActionImageTintColor), typeof(Color), typeof(MaterialChip), default(Color));
-        public new static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(MaterialChip), default(Color));
+        public static new readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(MaterialChip), default(Color));
         public static readonly BindableProperty FontFamilyProperty = BindableProperty.Create(nameof(FontFamily), typeof(string), typeof(MaterialChip), default(string));
         public static readonly BindableProperty ImageProperty = BindableProperty.Create(nameof(Image), typeof(ImageSource), typeof(MaterialChip), default(ImageSource));
         public static readonly BindableProperty ImageTintColorProperty = BindableProperty.Create(nameof(ImageTintColor), typeof(Color), typeof(MaterialChip), default(Color));
@@ -23,70 +23,70 @@ public partial class MaterialChip : ContentView
 
         public MaterialChip()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         public event EventHandler ActionImageTapped;
 
         public ImageSource ActionImage
         {
-            get => (ImageSource)this.GetValue(ActionImageProperty);
-            set => this.SetValue(ActionImageProperty, value);
+            get => (ImageSource)GetValue(ActionImageProperty);
+            set => SetValue(ActionImageProperty, value);
         }
 
         public Command ActionImageTappedCommand
         {
-            get => (Command)this.GetValue(ActionImageTappedCommandProperty);
-            set => this.SetValue(ActionImageTappedCommandProperty, value);
+            get => (Command)GetValue(ActionImageTappedCommandProperty);
+            set => SetValue(ActionImageTappedCommandProperty, value);
         }
 
         public Color ActionImageTintColor
         {
-            get => (Color)this.GetValue(ActionImageTintColorProperty);
-            set => this.SetValue(ActionImageTintColorProperty, value);
+            get => (Color)GetValue(ActionImageTintColorProperty);
+            set => SetValue(ActionImageTintColorProperty, value);
         }
 
         public new Color BackgroundColor
         {
-            get => (Color)this.GetValue(BackgroundColorProperty);
-            set => this.SetValue(BackgroundColorProperty, value);
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
         }
 
         public string FontFamily
         {
-            get => (string)this.GetValue(FontFamilyProperty);
-            set => this.SetValue(FontFamilyProperty, value);
+            get => (string)GetValue(FontFamilyProperty);
+            set => SetValue(FontFamilyProperty, value);
         }
 
         public ImageSource Image
         {
-            get => (ImageSource)this.GetValue(ImageProperty);
-            set => this.SetValue(ImageProperty, value);
+            get => (ImageSource)GetValue(ImageProperty);
+            set => SetValue(ImageProperty, value);
         }
 
         public Color ImageTintColor
         {
-            get => (Color)this.GetValue(ImageTintColorProperty);
-            set => this.SetValue(ImageTintColorProperty, value);
+            get => (Color)GetValue(ImageTintColorProperty);
+            set => SetValue(ImageTintColorProperty, value);
         }
 
         public string Text
         {
-            get => (string)this.GetValue(TextProperty);
-            set => this.SetValue(TextProperty, value);
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
         }
 
         public Color TextColor
         {
-            get => (Color)this.GetValue(TextColorProperty);
-            set => this.SetValue(TextColorProperty, value);
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            if (propertyName == nameof(this.BackgroundColor))
+            if (propertyName == nameof(BackgroundColor))
             {
-                ChipContainer.BackgroundColor = this.BackgroundColor;
+                ChipContainer.BackgroundColor = BackgroundColor;
             }
             else
             {
@@ -94,35 +94,35 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
                 switch (propertyName)
                 {
-                    case nameof(this.Text):
-                        ChipLabel.Text = this.Text;
+                    case nameof(Text):
+                        ChipLabel.Text = Text;
                         break;
-                    case nameof(this.ActionImageTintColor):
-                        ChipActionImage.TintColor = this.ActionImageTintColor;
+                    case nameof(ActionImageTintColor):
+                        ChipActionImage.TintColor = ActionImageTintColor;
                         break;
-                    case nameof(this.ImageTintColor):
-                        ChipImage.TintColor = this.ImageTintColor;
+                    case nameof(ImageTintColor):
+                        ChipImage.TintColor = ImageTintColor;
                         break;
-                    case nameof(this.TextColor):
-                        ChipLabel.TextColor = this.TextColor;
+                    case nameof(TextColor):
+                        ChipLabel.TextColor = TextColor;
                         break;
-                    case nameof(this.FontFamily):
-                        ChipLabel.FontFamily = this.FontFamily;
+                    case nameof(FontFamily):
+                        ChipLabel.FontFamily = FontFamily;
                         break;
-                    case nameof(this.Image):
-                        ChipImageContainer.IsVisible = this.Image != null;
-                        ChipImage.Source = this.Image;
+                    case nameof(Image):
+                        ChipImageContainer.IsVisible = Image != null;
+                        ChipImage.Source = Image;
                         break;
-                    case nameof(this.ActionImage):
+                    case nameof(ActionImage):
                         {
-                            ChipActionImage.Source = this.ActionImage;
-                            ChipActionImage.IsVisible = this.ActionImage != null;
+                            ChipActionImage.Source = ActionImage;
+                            ChipActionImage.IsVisible = ActionImage != null;
 
-                            if (this.ActionImage != null && ChipActionImage.GestureRecognizers.Count <= 0)
+                            if (ActionImage != null && ChipActionImage.GestureRecognizers.Count <= 0)
                             {
-                                ChipActionImage.GestureRecognizers.Add(new TapGestureRecognizer { Command = new Command(this.ActionImageTapHandled, () => !_canExecute), NumberOfTapsRequired = 1 });
+                                ChipActionImage.GestureRecognizers.Add(new TapGestureRecognizer { Command = new Command(ActionImageTapHandled, () => !_canExecute), NumberOfTapsRequired = 1 });
                             }
-                            else if (this.ActionImage == null)
+                            else if (ActionImage == null)
                             {
                                 ChipActionImage.GestureRecognizers.Clear();
                             }
@@ -136,8 +136,8 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         private void ActionImageTapHandled()
         {
             _canExecute = true;
-            this.ActionImageTappedCommand?.Execute(null);
-            this.ActionImageTapped?.Invoke(this, new EventArgs());
+            ActionImageTappedCommand?.Execute(null);
+            ActionImageTapped?.Invoke(this, new EventArgs());
             _canExecute = false;
         }
     }
diff --git a/XF.Material/UI/MaterialCircularLoadingView.cs b/XF.Material/UI/MaterialCircularLoadingView.cs
index faf7805f..4cc78880 100644
--- a/XF.Material/UI/MaterialCircularLoadingView.cs
+++ b/XF.Material/UI/MaterialCircularLoadingView.cs
@@ -12,14 +12,14 @@ public class MaterialCircularLoadingView : Lottie.Forms.AnimationView
         /// </summary>
         public Color TintColor
         {
-            get => (Color)this.GetValue(TintColorProperty);
-            set => this.SetValue(TintColorProperty, value);
+            get => (Color)GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
         }
 
         public MaterialCircularLoadingView()
         {
-            this.SetDynamicResource(TintColorProperty, MaterialConstants.Color.SECONDARY);
-            this.Loop = true;
+            SetDynamicResource(TintColorProperty, MaterialConstants.Color.SECONDARY);
+            Loop = true;
         }
     }
 }
diff --git a/XF.Material/UI/MaterialDateField.xaml.cs b/XF.Material/UI/MaterialDateField.xaml.cs
index be6e4b55..9f957947 100644
--- a/XF.Material/UI/MaterialDateField.xaml.cs
+++ b/XF.Material/UI/MaterialDateField.xaml.cs
@@ -86,18 +86,18 @@ public partial class MaterialDateField : ContentView, IMaterialElementConfigurat
         /// </summary>
         public MaterialDateField()
         {
-            this.InitializeComponent();
-            this.SetPropertyChangeHandler(ref this._propertyChangeActions);
-            this.SetControl();
+            InitializeComponent();
+            SetPropertyChangeHandler(ref _propertyChangeActions);
+            SetControl();
 
-            this.datePicker.PropertyChanged += this.DatePicker_PropertyChanged;
-            this.datePicker.DateSelected += this.DatePicker_DateChanged;
-            this.datePicker.SizeChanged += this.Entry_SizeChanged;
-            this.datePicker.Focused += this.DatePicker_Focused;
-            this.datePicker.Unfocused += this.DatePicker_Unfocused;
+            datePicker.PropertyChanged += DatePicker_PropertyChanged;
+            datePicker.DateSelected += DatePicker_DateChanged;
+            datePicker.SizeChanged += Entry_SizeChanged;
+            datePicker.Focused += DatePicker_Focused;
+            datePicker.Unfocused += DatePicker_Unfocused;
 
-            DeviceDisplay.MainDisplayInfoChanged += this.DeviceDisplay_MainDisplayInfoChanged;
-            this._lastDeviceDisplay = DeviceDisplay.MainDisplayInfo;
+            DeviceDisplay.MainDisplayInfoChanged += DeviceDisplay_MainDisplayInfoChanged;
+            _lastDeviceDisplay = DeviceDisplay.MainDisplayInfo;
         }
 
         public event EventHandler<SelectedItemChangedEventArgs> ChoiceSelected;
@@ -129,12 +129,12 @@ public bool AlwaysShowUnderline
         {
             get
             {
-                return (bool)this.GetValue(AlwaysShowUnderlineProperty);
+                return (bool)GetValue(AlwaysShowUnderlineProperty);
             }
 
             set
             {
-                this.SetValue(AlwaysShowUnderlineProperty, value);
+                SetValue(AlwaysShowUnderlineProperty, value);
             }
         }
 
@@ -145,12 +145,12 @@ public bool AlwaysShowUnderline
         {
             get
             {
-                return (Color)this.GetValue(BackgroundColorProperty);
+                return (Color)GetValue(BackgroundColorProperty);
             }
 
             set
             {
-                this.SetValue(BackgroundColorProperty, value);
+                SetValue(BackgroundColorProperty, value);
             }
         }
 
@@ -158,12 +158,12 @@ public ImageSource ClearIcon
         {
             get
             {
-                return (string)this.GetValue(ClearIconProperty);
+                return (string)GetValue(ClearIconProperty);
             }
 
             set
             {
-                this.SetValue(ClearIconProperty, value);
+                SetValue(ClearIconProperty, value);
             }
         }
 
@@ -175,12 +175,12 @@ public Color ErrorColor
         {
             get
             {
-                return (Color)this.GetValue(ErrorColorProperty);
+                return (Color)GetValue(ErrorColorProperty);
             }
 
             set
             {
-                this.SetValue(ErrorColorProperty, value);
+                SetValue(ErrorColorProperty, value);
             }
         }
 
@@ -191,12 +191,12 @@ public string ErrorText
         {
             get
             {
-                return (string)this.GetValue(ErrorTextProperty);
+                return (string)GetValue(ErrorTextProperty);
             }
 
             set
             {
-                this.SetValue(ErrorTextProperty, value);
+                SetValue(ErrorTextProperty, value);
             }
         }
 
@@ -207,12 +207,12 @@ public Color FloatingPlaceholderColor
         {
             get
             {
-                return (Color)this.GetValue(FloatingPlaceholderColorProperty);
+                return (Color)GetValue(FloatingPlaceholderColorProperty);
             }
 
             set
             {
-                this.SetValue(FloatingPlaceholderColorProperty, value);
+                SetValue(FloatingPlaceholderColorProperty, value);
             }
         }
 
@@ -223,12 +223,12 @@ public bool FloatingPlaceholderEnabled
         {
             get
             {
-                return (bool)this.GetValue(FloatingPlaceholderEnabledProperty);
+                return (bool)GetValue(FloatingPlaceholderEnabledProperty);
             }
 
             set
             {
-                this.SetValue(FloatingPlaceholderEnabledProperty, value);
+                SetValue(FloatingPlaceholderEnabledProperty, value);
             }
         }
 
@@ -239,12 +239,12 @@ public double FloatingPlaceholderFontSize
         {
             get
             {
-                return (double)this.GetValue(FloatingPlaceholderFontSizeProperty);
+                return (double)GetValue(FloatingPlaceholderFontSizeProperty);
             }
 
             set
             {
-                this.SetValue(FloatingPlaceholderFontSizeProperty, value);
+                SetValue(FloatingPlaceholderFontSizeProperty, value);
             }
         }
 
@@ -255,12 +255,12 @@ public Command<bool> FocusCommand
         {
             get
             {
-                return (Command<bool>)this.GetValue(FocusCommandProperty);
+                return (Command<bool>)GetValue(FocusCommandProperty);
             }
 
             set
             {
-                this.SetValue(FocusCommandProperty, value);
+                SetValue(FocusCommandProperty, value);
             }
         }
 
@@ -271,12 +271,12 @@ public bool HasError
         {
             get
             {
-                return (bool)this.GetValue(HasErrorProperty);
+                return (bool)GetValue(HasErrorProperty);
             }
 
             set
             {
-                this.SetValue(HasErrorProperty, value);
+                SetValue(HasErrorProperty, value);
             }
         }
 
@@ -287,12 +287,12 @@ public string HelperText
         {
             get
             {
-                return (string)this.GetValue(HelperTextProperty);
+                return (string)GetValue(HelperTextProperty);
             }
 
             set
             {
-                this.SetValue(HelperTextProperty, value);
+                SetValue(HelperTextProperty, value);
             }
         }
 
@@ -303,12 +303,12 @@ public Color HelperTextColor
         {
             get
             {
-                return (Color)this.GetValue(HelperTextColorProperty);
+                return (Color)GetValue(HelperTextColorProperty);
             }
 
             set
             {
-                this.SetValue(HelperTextColorProperty, value);
+                SetValue(HelperTextColorProperty, value);
             }
         }
 
@@ -319,12 +319,12 @@ public string HelperTextFontFamily
         {
             get
             {
-                return (string)this.GetValue(HelperTextFontFamilyProperty);
+                return (string)GetValue(HelperTextFontFamilyProperty);
             }
 
             set
             {
-                this.SetValue(HelperTextFontFamilyProperty, value);
+                SetValue(HelperTextFontFamilyProperty, value);
             }
         }
 
@@ -335,12 +335,12 @@ public MaterialHorizontalThickness HorizontalPadding
         {
             get
             {
-                return (MaterialHorizontalThickness)this.GetValue(HorizontalPaddingProperty);
+                return (MaterialHorizontalThickness)GetValue(HorizontalPaddingProperty);
             }
 
             set
             {
-                this.SetValue(HorizontalPaddingProperty, value);
+                SetValue(HorizontalPaddingProperty, value);
             }
         }
 
@@ -351,12 +351,12 @@ public string LeadingIcon
         {
             get
             {
-                return (string)this.GetValue(LeadingIconProperty);
+                return (string)GetValue(LeadingIconProperty);
             }
 
             set
             {
-                this.SetValue(LeadingIconProperty, value);
+                SetValue(LeadingIconProperty, value);
             }
         }
 
@@ -367,12 +367,12 @@ public Color LeadingIconTintColor
         {
             get
             {
-                return (Color)this.GetValue(LeadingIconTintColorProperty);
+                return (Color)GetValue(LeadingIconTintColorProperty);
             }
 
             set
             {
-                this.SetValue(LeadingIconTintColorProperty, value);
+                SetValue(LeadingIconTintColorProperty, value);
             }
         }
 
@@ -383,17 +383,17 @@ public string Placeholder
         {
             get
             {
-                return (string)this.GetValue(PlaceholderProperty);
+                return (string)GetValue(PlaceholderProperty);
             }
 
             set
             {
                 if (string.IsNullOrWhiteSpace(value))
                 {
-                    throw new ArgumentNullException($"{nameof(this.Placeholder)} must not be null, empty, or a white space.");
+                    throw new ArgumentNullException($"{nameof(Placeholder)} must not be null, empty, or a white space.");
                 }
 
-                this.SetValue(PlaceholderProperty, value);
+                SetValue(PlaceholderProperty, value);
             }
         }
 
@@ -404,12 +404,12 @@ public Color PlaceholderColor
         {
             get
             {
-                return (Color)this.GetValue(PlaceholderColorProperty);
+                return (Color)GetValue(PlaceholderColorProperty);
             }
 
             set
             {
-                this.SetValue(PlaceholderColorProperty, value);
+                SetValue(PlaceholderColorProperty, value);
             }
         }
 
@@ -420,12 +420,12 @@ public string PlaceholderFontFamily
         {
             get
             {
-                return (string)this.GetValue(PlaceholderFontFamilyProperty);
+                return (string)GetValue(PlaceholderFontFamilyProperty);
             }
 
             set
             {
-                this.SetValue(PlaceholderFontFamilyProperty, value);
+                SetValue(PlaceholderFontFamilyProperty, value);
             }
         }
 
@@ -436,12 +436,12 @@ public bool ShouldAnimateUnderline
         {
             get
             {
-                return (bool)this.GetValue(ShouldAnimateUnderlineProperty);
+                return (bool)GetValue(ShouldAnimateUnderlineProperty);
             }
 
             set
             {
-                this.SetValue(ShouldAnimateUnderlineProperty, value);
+                SetValue(ShouldAnimateUnderlineProperty, value);
             }
         }
 
@@ -452,21 +452,21 @@ public DateTime? Date
         {
             get
             {
-                return (DateTime?)this.GetValue(DateProperty);
+                return (DateTime?)GetValue(DateProperty);
             }
 
             set
             {
-                if (value.HasValue && !this.FloatingPlaceholderEnabled)
+                if (value.HasValue && !FloatingPlaceholderEnabled)
                 {
-                    this.placeholder.IsVisible = false;
+                    placeholder.IsVisible = false;
                 }
-                else if (!value.HasValue && !this.FloatingPlaceholderEnabled)
+                else if (!value.HasValue && !FloatingPlaceholderEnabled)
                 {
-                    this.placeholder.IsVisible = true;
+                    placeholder.IsVisible = true;
                 }
 
-                this.SetValue(DateProperty, value);
+                SetValue(DateProperty, value);
             }
         }
 
@@ -477,12 +477,12 @@ public Command<DateTime?> DateChangeCommand
         {
             get
             {
-                return (Command<DateTime?>)this.GetValue(DateChangeCommandProperty);
+                return (Command<DateTime?>)GetValue(DateChangeCommandProperty);
             }
 
             set
             {
-                this.SetValue(DateChangeCommandProperty, value);
+                SetValue(DateChangeCommandProperty, value);
             }
         }
 
@@ -493,12 +493,12 @@ public Color TextColor
         {
             get
             {
-                return (Color)this.GetValue(TextColorProperty);
+                return (Color)GetValue(TextColorProperty);
             }
 
             set
             {
-                this.SetValue(TextColorProperty, value);
+                SetValue(TextColorProperty, value);
             }
         }
 
@@ -509,12 +509,12 @@ public string TextFontFamily
         {
             get
             {
-                return (string)this.GetValue(TextFontFamilyProperty);
+                return (string)GetValue(TextFontFamilyProperty);
             }
 
             set
             {
-                this.SetValue(TextFontFamilyProperty, value);
+                SetValue(TextFontFamilyProperty, value);
             }
         }
 
@@ -525,12 +525,12 @@ public double TextFontSize
         {
             get
             {
-                return (double)this.GetValue(TextFontSizeProperty);
+                return (double)GetValue(TextFontSizeProperty);
             }
 
             set
             {
-                this.SetValue(TextFontSizeProperty, value);
+                SetValue(TextFontSizeProperty, value);
             }
         }
 
@@ -542,12 +542,12 @@ public Color TintColor
         {
             get
             {
-                return (Color)this.GetValue(TintColorProperty);
+                return (Color)GetValue(TintColorProperty);
             }
 
             set
             {
-                this.SetValue(TintColorProperty, value);
+                SetValue(TintColorProperty, value);
             }
         }
 
@@ -558,12 +558,12 @@ public Color UnderlineColor
         {
             get
             {
-                return (Color)this.GetValue(UnderlineColorProperty);
+                return (Color)GetValue(UnderlineColorProperty);
             }
 
             set
             {
-                this.SetValue(UnderlineColorProperty, value);
+                SetValue(UnderlineColorProperty, value);
             }
         }
 
@@ -582,7 +582,7 @@ public void ElementChanged(bool created)
         /// </summary>
         public new void Focus()
         {
-            this.datePicker.Focus();
+            datePicker.Focus();
         }
 
         /// <summary>
@@ -590,21 +590,21 @@ public void ElementChanged(bool created)
         /// </summary>
         public new void Unfocus()
         {
-            this.datePicker.Unfocus();
+            datePicker.Unfocus();
         }
 
         protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
 
-            this.AnimateToInactiveOrFocusedStateOnStart(this.BindingContext);
+            AnimateToInactiveOrFocusedStateOnStart(BindingContext);
         }
 
         protected override void OnParentSet()
         {
             base.OnParentSet();
 
-            this.AnimateToInactiveOrFocusedStateOnStart(this.Parent);
+            AnimateToInactiveOrFocusedStateOnStart(Parent);
         }
 
         /// <inheritdoc />
@@ -621,7 +621,7 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
                 return;
             }
 
-            if (this._propertyChangeActions != null && this._propertyChangeActions.TryGetValue(propertyName, out Action handlePropertyChange))
+            if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(propertyName, out var handlePropertyChange))
             {
                 handlePropertyChange();
             }
@@ -629,184 +629,184 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
         private void AnimateToActivatedState()
         {
-            Animation anim = new Animation();
-            bool hasDate = this.Date.HasValue;
+            var anim = new Animation();
+            var hasDate = Date.HasValue;
 
-            if (this.datePicker.IsFocused)
+            if (datePicker.IsFocused)
             {
-                Color tintColor = this.HasError ? this.ErrorColor : this.TintColor;
+                var tintColor = HasError ? ErrorColor : TintColor;
 
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
-                    anim.Add(0.0, AnimationDuration, new Animation(v => this.underline.HeightRequest = v, 1, 2, this._animationCurve, () =>
+                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.HeightRequest = v, 1, 2, _animationCurve, () =>
                     {
-                        this.underline.Color = tintColor;
+                        underline.Color = tintColor;
                     }));
                 }
 
-                this.placeholder.TextColor = tintColor;
+                placeholder.TextColor = tintColor;
             }
             else
             {
-                Color underlineColor = this.HasError ? this.ErrorColor : this.UnderlineColor;
-                Color placeholderColor = this.HasError ? this.ErrorColor : this.FloatingPlaceholderColor;
+                var underlineColor = HasError ? ErrorColor : UnderlineColor;
+                var placeholderColor = HasError ? ErrorColor : FloatingPlaceholderColor;
 
-                int endHeight = hasDate ? 1 : 0;
+                var endHeight = hasDate ? 1 : 0;
 
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
-                    anim.Add(0.0, AnimationDuration, new Animation(v => this.underline.HeightRequest = v, this.underline.HeightRequest, endHeight, this._animationCurve, () =>
+                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.HeightRequest = v, underline.HeightRequest, endHeight, _animationCurve, () =>
                     {
-                        this.underline.Color = underlineColor;
+                        underline.Color = underlineColor;
                     }));
                 }
 
-                this.placeholder.TextColor = placeholderColor;
+                placeholder.TextColor = placeholderColor;
             }
 
-            anim.Commit(this, "UnfocusAnimation", rate: 2, length: (uint)(Device.RuntimePlatform == Device.iOS ? 500 : AnimationDuration * 1000), easing: this._animationCurve);
+            anim.Commit(this, "UnfocusAnimation", rate: 2, length: (uint)(Device.RuntimePlatform == Device.iOS ? 500 : AnimationDuration * 1000), easing: _animationCurve);
         }
 
         private void AnimateToInactiveOrFocusedState()
         {
             Color tintColor;
-            double preferredStartFont = this.FloatingPlaceholderFontSize == 0 ? this.datePicker.FontSize * 0.75 : this.FloatingPlaceholderFontSize;
-            double preferredEndFont = this.FloatingPlaceholderFontSize == 0 ? this.datePicker.FontSize * 0.75 : this.FloatingPlaceholderFontSize;
-            double startFont = this.datePicker.IsFocused ? this.datePicker.FontSize : preferredStartFont;
-            double endFOnt = this.datePicker.IsFocused ? preferredEndFont : this.datePicker.FontSize;
-            double startY = this.placeholder.TranslationY;
-            double endY = this.datePicker.IsFocused ? -(this.datePicker.FontSize * 0.8) : 0;
+            var preferredStartFont = FloatingPlaceholderFontSize == 0 ? datePicker.FontSize * 0.75 : FloatingPlaceholderFontSize;
+            var preferredEndFont = FloatingPlaceholderFontSize == 0 ? datePicker.FontSize * 0.75 : FloatingPlaceholderFontSize;
+            var startFont = datePicker.IsFocused ? datePicker.FontSize : preferredStartFont;
+            var endFOnt = datePicker.IsFocused ? preferredEndFont : datePicker.FontSize;
+            var startY = placeholder.TranslationY;
+            var endY = datePicker.IsFocused ? -(datePicker.FontSize * 0.8) : 0;
 
-            if (this.HasError)
+            if (HasError)
             {
-                tintColor = this.datePicker.IsFocused ? this.ErrorColor : this.PlaceholderColor;
+                tintColor = datePicker.IsFocused ? ErrorColor : PlaceholderColor;
             }
             else
             {
-                tintColor = this.datePicker.IsFocused ? this.TintColor : this.PlaceholderColor;
+                tintColor = datePicker.IsFocused ? TintColor : PlaceholderColor;
             }
 
-            Animation anim = this.FloatingPlaceholderEnabled ? new Animation
+            var anim = FloatingPlaceholderEnabled ? new Animation
             {
                 {
                     0.0,
                     AnimationDuration,
-                    new Animation(v => this.placeholder.FontSize = v, startFont, endFOnt, this._animationCurve)
+                    new Animation(v => placeholder.FontSize = v, startFont, endFOnt, _animationCurve)
                 },
                 {
                     0.0,
                     AnimationDuration,
-                    new Animation(v => this.placeholder.TranslationY = v, startY, endY, this._animationCurve, () =>
+                    new Animation(v => placeholder.TranslationY = v, startY, endY, _animationCurve, () =>
                     {
-                        if(this.HasError && this.datePicker.IsFocused)
+                        if(HasError && datePicker.IsFocused)
                         {
-                            this.placeholder.TextColor = this.ErrorColor;
+                            placeholder.TextColor = ErrorColor;
                         }
 
-                        this.placeholder.TextColor = tintColor;
+                        placeholder.TextColor = tintColor;
                     })
                 }
             } : new Animation();
 
-            if (this.datePicker.IsFocused)
+            if (datePicker.IsFocused)
             {
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
-                    this.underline.Color = this.HasError ? this.ErrorColor : this.TintColor;
+                    underline.Color = HasError ? ErrorColor : TintColor;
 
-                    anim.Add(0.0, AnimationDuration, new Animation(v => this.underline.WidthRequest = v, 0, this.Width, this._animationCurve, () =>
+                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, Width, _animationCurve, () =>
                     {
-                        this.underline.WidthRequest = -1;
-                        this.underline.HorizontalOptions = LayoutOptions.FillAndExpand;
+                        underline.WidthRequest = -1;
+                        underline.HorizontalOptions = LayoutOptions.FillAndExpand;
                     }));
                 }
             }
             else
             {
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
-                    anim.Add(0.0, AnimationDuration, new Animation(v => this.underline.HeightRequest = v, this.underline.HeightRequest, 0, this._animationCurve, () =>
+                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.HeightRequest = v, underline.HeightRequest, 0, _animationCurve, () =>
                     {
-                        this.underline.WidthRequest = 0;
-                        this.underline.HeightRequest = 2;
-                        this.underline.HorizontalOptions = LayoutOptions.Center;
+                        underline.WidthRequest = 0;
+                        underline.HeightRequest = 2;
+                        underline.HorizontalOptions = LayoutOptions.Center;
                     }));
                 }
             }
 
-            anim.Commit(this, "FocusAnimation", rate: 2, length: (uint)(Device.RuntimePlatform == Device.iOS ? 500 : AnimationDuration * 1000), easing: this._animationCurve);
+            anim.Commit(this, "FocusAnimation", rate: 2, length: (uint)(Device.RuntimePlatform == Device.iOS ? 500 : AnimationDuration * 1000), easing: _animationCurve);
         }
 
         private void AnimateToInactiveOrFocusedStateOnStart(object startObject)
         {
-            double placeholderEndY = -(this.datePicker.FontSize * 0.8);
-            double placeholderEndFont = this.datePicker.FontSize * 0.75;
+            var placeholderEndY = -(datePicker.FontSize * 0.8);
+            var placeholderEndFont = datePicker.FontSize * 0.75;
 
-            if (!this.FloatingPlaceholderEnabled && !this.datePicker.NullableDate.HasValue)
+            if (!FloatingPlaceholderEnabled && !datePicker.NullableDate.HasValue)
             {
-                this.placeholder.TextColor = this.PlaceholderColor;
+                placeholder.TextColor = PlaceholderColor;
             }
 
-            if (startObject != null && this.Date.HasValue /*&& !this._wasFocused*/)
+            if (startObject != null && Date.HasValue /*&& !this._wasFocused*/)
             {
-                this.datePicker.Opacity = 0;
+                datePicker.Opacity = 0;
 
                 Device.BeginInvokeOnMainThread(() =>
                 {
-                    Animation anim = new Animation();
+                    var anim = new Animation();
 
-                    if (this.FloatingPlaceholderEnabled)
+                    if (FloatingPlaceholderEnabled)
                     {
-                        anim.Add(0.0, AnimationDuration, new Animation(v => this.placeholder.FontSize = v, this.datePicker.FontSize, placeholderEndFont, this._animationCurve));
-                        anim.Add(0.0, AnimationDuration, new Animation(v => this.placeholder.TranslationY = v, this.placeholder.TranslationY, placeholderEndY, this._animationCurve, () =>
+                        anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.FontSize = v, datePicker.FontSize, placeholderEndFont, _animationCurve));
+                        anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.TranslationY = v, placeholder.TranslationY, placeholderEndY, _animationCurve, () =>
                         {
-                            this.placeholder.TextColor = this.HasError ? this.ErrorColor : this.FloatingPlaceholderColor;
-                            this.datePicker.Opacity = 1;
+                            placeholder.TextColor = HasError ? ErrorColor : FloatingPlaceholderColor;
+                            datePicker.Opacity = 1;
                         }));
                     }
 
-                    if (this.ShouldAnimateUnderline)
+                    if (ShouldAnimateUnderline)
                     {
-                        this.underline.Color = this.HasError ? this.ErrorColor : this.TintColor;
-                        this.underline.HeightRequest = 1;
-                        anim.Add(0.0, AnimationDuration, new Animation(v => this.underline.WidthRequest = v, 0, this.Width, this._animationCurve, () => this.underline.HorizontalOptions = LayoutOptions.FillAndExpand));
+                        underline.Color = HasError ? ErrorColor : TintColor;
+                        underline.HeightRequest = 1;
+                        anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, Width, _animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
                     }
 
-                    anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: this._animationCurve);
+                    anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: _animationCurve);
                 });
 
-                this.datePicker.Opacity = 1;
+                datePicker.Opacity = 1;
 
                 return;
             }
 
-            if (startObject != null && !this.Date.HasValue && this.placeholder.TranslationY == placeholderEndY)
+            if (startObject != null && !Date.HasValue && placeholder.TranslationY == placeholderEndY)
             {
-                if (this.datePicker.IsFocused)
+                if (datePicker.IsFocused)
                 {
                     return;
                 }
 
                 Device.BeginInvokeOnMainThread(() =>
                 {
-                    Animation anim = new Animation();
+                    var anim = new Animation();
 
-                    if (this.FloatingPlaceholderEnabled)
+                    if (FloatingPlaceholderEnabled)
                     {
-                        anim.Add(0.0, AnimationDuration, new Animation(v => this.placeholder.FontSize = v, placeholderEndFont, this.datePicker.FontSize, this._animationCurve));
-                        anim.Add(0.0, AnimationDuration, new Animation(v => this.placeholder.TranslationY = v, this.placeholder.TranslationY, 0, this._animationCurve, () =>
+                        anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.FontSize = v, placeholderEndFont, datePicker.FontSize, _animationCurve));
+                        anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.TranslationY = v, placeholder.TranslationY, 0, _animationCurve, () =>
                         {
-                            this.placeholder.TextColor = this.PlaceholderColor;
-                            this.datePicker.Opacity = 1;
+                            placeholder.TextColor = PlaceholderColor;
+                            datePicker.Opacity = 1;
                         }));
                     }
 
-                    if (this.ShouldAnimateUnderline)
+                    if (ShouldAnimateUnderline)
                     {
-                        anim.Add(0.0, AnimationDuration, new Animation(v => this.underline.WidthRequest = v, this.Width, 0, this._animationCurve, () => this.underline.HorizontalOptions = LayoutOptions.Center));
+                        anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, Width, 0, _animationCurve, () => underline.HorizontalOptions = LayoutOptions.Center));
                     }
 
-                    anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: this._animationCurve);
+                    anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: _animationCurve);
                 });
             }
         }
@@ -815,27 +815,27 @@ private void ChangeToErrorState()
         {
             const int animDuration = 250;
 
-            this.placeholder.TextColor = (this.FloatingPlaceholderEnabled && this.datePicker.IsFocused) || (this.FloatingPlaceholderEnabled && this.datePicker.NullableDate.HasValue) ? this.ErrorColor : this.PlaceholderColor;
-            this.counter.TextColor = this.ErrorColor;
-            this.underline.Color = this.ShouldAnimateUnderline ? this.ErrorColor : Color.Transparent;
-            this.persistentUnderline.Color = this.AlwaysShowUnderline ? this.ErrorColor : Color.Transparent;
-            this.trailingIcon.IsVisible = true;
-            this.trailingIcon.Source = "xf_error";
-            this.trailingIcon.TintColor = this.ErrorColor;
+            placeholder.TextColor = (FloatingPlaceholderEnabled && datePicker.IsFocused) || (FloatingPlaceholderEnabled && datePicker.NullableDate.HasValue) ? ErrorColor : PlaceholderColor;
+            counter.TextColor = ErrorColor;
+            underline.Color = ShouldAnimateUnderline ? ErrorColor : Color.Transparent;
+            persistentUnderline.Color = AlwaysShowUnderline ? ErrorColor : Color.Transparent;
+            trailingIcon.IsVisible = true;
+            trailingIcon.Source = "xf_error";
+            trailingIcon.TintColor = ErrorColor;
 
-            if (string.IsNullOrEmpty(this.ErrorText))
+            if (string.IsNullOrEmpty(ErrorText))
             {
-                this.helper.TextColor = this.ErrorColor;
+                helper.TextColor = ErrorColor;
             }
             else
             {
                 Device.BeginInvokeOnMainThread(async () =>
                 {
-                    await this.helper.FadeTo(0, animDuration / 2, this._animationCurve);
-                    this.helper.TranslationY = -4;
-                    this.helper.TextColor = this.ErrorColor;
-                    this.helper.Text = this.ErrorText;
-                    await Task.WhenAll(this.helper.FadeTo(1, animDuration / 2, this._animationCurve), this.helper.TranslateTo(0, 0, animDuration / 2, this._animationCurve));
+                    await helper.FadeTo(0, animDuration / 2, _animationCurve);
+                    helper.TranslationY = -4;
+                    helper.TextColor = ErrorColor;
+                    helper.Text = ErrorText;
+                    await Task.WhenAll(helper.FadeTo(1, animDuration / 2, _animationCurve), helper.TranslateTo(0, 0, animDuration / 2, _animationCurve));
                 });
             }
         }
@@ -844,286 +844,286 @@ private void ChangeToNormalState()
         {
             const double opactiy = 1;
 
-            this.IsEnabled = true;
-            this.datePicker.Opacity = opactiy;
-            this.placeholder.Opacity = opactiy;
-            this.helper.Opacity = opactiy;
-            this.underline.Opacity = opactiy;
+            IsEnabled = true;
+            datePicker.Opacity = opactiy;
+            placeholder.Opacity = opactiy;
+            helper.Opacity = opactiy;
+            underline.Opacity = opactiy;
 
             Device.BeginInvokeOnMainThread(async () =>
             {
 
-                this.trailingIcon.IsVisible = false;
+                trailingIcon.IsVisible = false;
 
-                Color accentColor = this.TintColor;
-                this.placeholder.TextColor = accentColor;
-                this.counter.TextColor = this.HelperTextColor;
-                this.underline.Color = accentColor;
-                this.persistentUnderline.Color = this.UnderlineColor;
+                var accentColor = TintColor;
+                placeholder.TextColor = accentColor;
+                counter.TextColor = HelperTextColor;
+                underline.Color = accentColor;
+                persistentUnderline.Color = UnderlineColor;
 
-                if (string.IsNullOrEmpty(this.ErrorText))
+                if (string.IsNullOrEmpty(ErrorText))
                 {
-                    this.helper.TextColor = this.HelperTextColor;
+                    helper.TextColor = HelperTextColor;
                 }
                 else
                 {
-                    await this.helper.FadeTo(0, 150, this._animationCurve);
-                    this.helper.TranslationY = -4;
-                    this.helper.TextColor = this.HelperTextColor;
-                    this.helper.Text = this.HelperText;
-                    await Task.WhenAll(this.helper.FadeTo(1, 150, this._animationCurve), this.helper.TranslateTo(0, 0, 150, this._animationCurve));
+                    await helper.FadeTo(0, 150, _animationCurve);
+                    helper.TranslationY = -4;
+                    helper.TextColor = HelperTextColor;
+                    helper.Text = HelperText;
+                    await Task.WhenAll(helper.FadeTo(1, 150, _animationCurve), helper.TranslateTo(0, 0, 150, _animationCurve));
                 }
             });
         }
 
         private void DeviceDisplay_MainDisplayInfoChanged(object sender, DisplayInfoChangedEventArgs e)
         {
-            if (e.DisplayInfo.Orientation != this._lastDeviceDisplay.Orientation)
+            if (e.DisplayInfo.Orientation != _lastDeviceDisplay.Orientation)
             {
-                if (this.datePicker.NullableDate.HasValue && this.ShouldAnimateUnderline)
+                if (datePicker.NullableDate.HasValue && ShouldAnimateUnderline)
                 {
-                    this.underline.WidthRequest = -1;
-                    this.underline.HorizontalOptions = LayoutOptions.FillAndExpand;
+                    underline.WidthRequest = -1;
+                    underline.HorizontalOptions = LayoutOptions.FillAndExpand;
                 }
 
-                this._lastDeviceDisplay = e.DisplayInfo;
+                _lastDeviceDisplay = e.DisplayInfo;
             }
         }
 
         private void Entry_Completed(object sender, EventArgs e)
         {
-            this.Completed?.Invoke(this, EventArgs.Empty);
+            Completed?.Invoke(this, EventArgs.Empty);
         }
 
         private void DatePicker_Focused(object sender, FocusEventArgs e)
         {
-            this._wasFocused = true;
-            this.FocusCommand?.Execute(this.datePicker.IsFocused);
-            this.Focused?.Invoke(this, e);
+            _wasFocused = true;
+            FocusCommand?.Execute(datePicker.IsFocused);
+            Focused?.Invoke(this, e);
         }
 
         private void DatePicker_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
             {
-                case nameof(this.IsFocused) when !this.datePicker.NullableDate.HasValue:
-                    this.AnimateToInactiveOrFocusedState();
+                case nameof(IsFocused) when !datePicker.NullableDate.HasValue:
+                    AnimateToInactiveOrFocusedState();
                     break;
 
-                case nameof(this.IsFocused) when this.datePicker.NullableDate.HasValue:
-                    this.AnimateToActivatedState();
+                case nameof(IsFocused) when datePicker.NullableDate.HasValue:
+                    AnimateToActivatedState();
                     break;
             }
         }
 
         private void Entry_SizeChanged(object sender, EventArgs e)
         {
-            int baseHeight = this.FloatingPlaceholderEnabled ? 56 : 40;
-            double diff = this.datePicker.Height - 20;
-            double rawRowHeight = baseHeight + diff;
-            this._autoSizingRow.Height = new GridLength(rawRowHeight);
+            var baseHeight = FloatingPlaceholderEnabled ? 56 : 40;
+            var diff = datePicker.Height - 20;
+            var rawRowHeight = baseHeight + diff;
+            _autoSizingRow.Height = new GridLength(rawRowHeight);
 
-            double iconVerticalMargin = (this._autoSizingRow.Height.Value - 24) / 2;
+            var iconVerticalMargin = (_autoSizingRow.Height.Value - 24) / 2;
 
-            if (this.leadingIcon.IsVisible)
+            if (leadingIcon.IsVisible)
             {
-                this.leadingIcon.Margin = new Thickness(this.HorizontalPadding.Left, iconVerticalMargin, 0, iconVerticalMargin);
-                this.datePicker.Margin = new Thickness(12, this.datePicker.Margin.Top, this.HorizontalPadding.Right, this.datePicker.Margin.Bottom);
+                leadingIcon.Margin = new Thickness(HorizontalPadding.Left, iconVerticalMargin, 0, iconVerticalMargin);
+                datePicker.Margin = new Thickness(12, datePicker.Margin.Top, HorizontalPadding.Right, datePicker.Margin.Bottom);
             }
             else
             {
-                this.datePicker.Margin = new Thickness(this.HorizontalPadding.Left, this.datePicker.Margin.Top, this.HorizontalPadding.Right, this.datePicker.Margin.Bottom);
+                datePicker.Margin = new Thickness(HorizontalPadding.Left, datePicker.Margin.Top, HorizontalPadding.Right, datePicker.Margin.Bottom);
             }
 
-            if (this.trailingIcon.IsVisible)
+            if (trailingIcon.IsVisible)
             {
-                MaterialHorizontalThickness entryPaddingLeft = this.leadingIcon.IsVisible ? 12 : this.HorizontalPadding;
-                this.trailingIcon.Margin = new Thickness(12, iconVerticalMargin, this.HorizontalPadding.Right, iconVerticalMargin);
-                this.datePicker.Margin = new Thickness(entryPaddingLeft.Left, this.datePicker.Margin.Top, 0, this.datePicker.Margin.Bottom);
+                var entryPaddingLeft = leadingIcon.IsVisible ? 12 : HorizontalPadding;
+                trailingIcon.Margin = new Thickness(12, iconVerticalMargin, HorizontalPadding.Right, iconVerticalMargin);
+                datePicker.Margin = new Thickness(entryPaddingLeft.Left, datePicker.Margin.Top, 0, datePicker.Margin.Bottom);
             }
 
-            this.helper.Margin = new Thickness(this.HorizontalPadding.Left, this.helper.Margin.Top, 12, 0);
-            this.counter.Margin = new Thickness(0, this.counter.Margin.Top, this.HorizontalPadding.Right, 0);
+            helper.Margin = new Thickness(HorizontalPadding.Left, helper.Margin.Top, 12, 0);
+            counter.Margin = new Thickness(0, counter.Margin.Top, HorizontalPadding.Right, 0);
 
-            double placeholderLeftMargin = this.FloatingPlaceholderEnabled ? this.HorizontalPadding.Left : this.datePicker.Margin.Left;
-            this.placeholder.Margin = new Thickness(placeholderLeftMargin, 0, 0, 0);
+            var placeholderLeftMargin = FloatingPlaceholderEnabled ? HorizontalPadding.Left : datePicker.Margin.Left;
+            placeholder.Margin = new Thickness(placeholderLeftMargin, 0, 0, 0);
 
-            if (this.HasError)
+            if (HasError)
             {
-                this.underline.Color = this.ErrorColor;
+                underline.Color = ErrorColor;
             }
         }
 
         private void DatePicker_DateChanged(object sender, NullableDateChangedEventArgs e)
         {
-            this.Date = this.datePicker.NullableDate;
-            this.DateChangeCommand?.Execute(this.datePicker.NullableDate);
-            this.DateChanged?.Invoke(this, e);
+            Date = datePicker.NullableDate;
+            DateChangeCommand?.Execute(datePicker.NullableDate);
+            DateChanged?.Invoke(this, e);
         }
 
         private void DatePicker_Unfocused(object sender, FocusEventArgs e)
         {
-            this.FocusCommand?.Execute(this.datePicker.IsFocused);
-            this.Unfocused?.Invoke(this, e);
+            FocusCommand?.Execute(datePicker.IsFocused);
+            Unfocused?.Invoke(this, e);
         }
 
 
         private void OnAlwaysShowUnderlineChanged(bool isShown)
         {
-            this.persistentUnderline.IsVisible = isShown;
-            this.persistentUnderline.Color = this.UnderlineColor;
+            persistentUnderline.IsVisible = isShown;
+            persistentUnderline.Color = UnderlineColor;
         }
 
         private void OnBackgroundColorChanged(Color backgroundColor)
         {
-            this.backgroundCard.BackgroundColor = backgroundColor;
+            backgroundCard.BackgroundColor = backgroundColor;
         }
 
 
         private void OnEnabledChanged(bool isEnabled)
         {
-            this.Opacity = isEnabled ? 1 : 0.33;
-            this.helper.IsVisible = isEnabled && !string.IsNullOrEmpty(this.HelperText);
+            Opacity = isEnabled ? 1 : 0.33;
+            helper.IsVisible = isEnabled && !string.IsNullOrEmpty(HelperText);
         }
 
         private void OnErrorColorChanged(Color errorColor)
         {
-            this.trailingIcon.TintColor = errorColor;
+            trailingIcon.TintColor = errorColor;
         }
 
         private void OnErrorTextChanged()
         {
-            if (this.HasError)
+            if (HasError)
             {
-                this.ChangeToErrorState();
+                ChangeToErrorState();
             }
         }
 
         private void OnFloatingPlaceholderEnabledChanged(bool isEnabled)
         {
             double marginTopVariation = Device.RuntimePlatform == Device.iOS ? 18 : 20;
-            this.datePicker.Margin = isEnabled ? new Thickness(this.datePicker.Margin.Left, 24, this.datePicker.Margin.Right, 0) : new Thickness(this.datePicker.Margin.Left, marginTopVariation - 9, this.datePicker.Margin.Right, 0);
+            datePicker.Margin = isEnabled ? new Thickness(datePicker.Margin.Left, 24, datePicker.Margin.Right, 0) : new Thickness(datePicker.Margin.Left, marginTopVariation - 9, datePicker.Margin.Right, 0);
 
-            Thickness iconMargin = this.leadingIcon.Margin;
-            this.leadingIcon.Margin = isEnabled ? new Thickness(iconMargin.Left, 16, iconMargin.Right, 16) : new Thickness(iconMargin.Left, 8, iconMargin.Right, 8);
+            var iconMargin = leadingIcon.Margin;
+            leadingIcon.Margin = isEnabled ? new Thickness(iconMargin.Left, 16, iconMargin.Right, 16) : new Thickness(iconMargin.Left, 8, iconMargin.Right, 8);
 
-            Thickness trailingIconMargin = this.trailingIcon.Margin;
-            this.trailingIcon.Margin = isEnabled ? new Thickness(trailingIconMargin.Left, 16, trailingIconMargin.Right, 16) : new Thickness(trailingIconMargin.Left, 8, trailingIconMargin.Right, 8);
+            var trailingIconMargin = trailingIcon.Margin;
+            trailingIcon.Margin = isEnabled ? new Thickness(trailingIconMargin.Left, 16, trailingIconMargin.Right, 16) : new Thickness(trailingIconMargin.Left, 8, trailingIconMargin.Right, 8);
         }
 
         private void OnHasErrorChanged()
         {
-            if (this.HasError)
+            if (HasError)
             {
-                this.ChangeToErrorState();
+                ChangeToErrorState();
             }
             else
             {
-                this.ChangeToNormalState();
+                ChangeToNormalState();
             }
         }
 
         private void OnHelperTextChanged(string helperText)
         {
-            this.helper.Text = helperText;
-            this.helper.IsVisible = !string.IsNullOrEmpty(helperText);
+            helper.Text = helperText;
+            helper.IsVisible = !string.IsNullOrEmpty(helperText);
         }
 
         private void OnHelperTextColorChanged(Color textColor)
         {
-            this.helper.TextColor = this.counter.TextColor = textColor;
+            helper.TextColor = counter.TextColor = textColor;
         }
 
         private void OnHelpertTextFontFamilyChanged(string fontFamily)
         {
-            this.helper.FontFamily = this.counter.FontFamily = fontFamily;
+            helper.FontFamily = counter.FontFamily = fontFamily;
         }
 
         private void OnLeadingIconChanged(string icon)
         {
-            this.leadingIcon.Source = icon;
-            this.OnLeadingIconTintColorChanged(this.LeadingIconTintColor);
+            leadingIcon.Source = icon;
+            OnLeadingIconTintColorChanged(LeadingIconTintColor);
         }
 
         private void OnLeadingIconTintColorChanged(Color tintColor)
         {
-            this.leadingIcon.TintColor = tintColor;
+            leadingIcon.TintColor = tintColor;
         }
 
         private void OnPlaceholderChanged(string placeholderText)
         {
-            this.placeholder.Text = placeholderText;
+            placeholder.Text = placeholderText;
         }
 
         private void OnPlaceholderColorChanged(Color placeholderColor)
         {
-            this.placeholder.TextColor = placeholderColor;
+            placeholder.TextColor = placeholderColor;
         }
 
         private void OnPlaceholderFontFamilyChanged(string fontFamily)
         {
-            this.placeholder.FontFamily = fontFamily;
+            placeholder.FontFamily = fontFamily;
         }
 
         private void OnDateChanged(DateTime? date)
         {
-            this.datePicker.NullableDate = date;
-            this.clearIcon.IsVisible = date.HasValue;
-            this.AnimateToInactiveOrFocusedStateOnStart(this);
+            datePicker.NullableDate = date;
+            clearIcon.IsVisible = date.HasValue;
+            AnimateToInactiveOrFocusedStateOnStart(this);
         }
 
         private void OnTextColorChanged(Color textColor)
         {
-            this.datePicker.TextColor = this.trailingIcon.TintColor = textColor;
+            datePicker.TextColor = trailingIcon.TintColor = textColor;
         }
 
         private void OnTextFontFamilyChanged(string fontFamily)
         {
-            this.datePicker.FontFamily = fontFamily;
+            datePicker.FontFamily = fontFamily;
         }
 
         private void OnTextFontSizeChanged(double fontSize)
         {
-            this.placeholder.FontSize = this.datePicker.FontSize = fontSize;
+            placeholder.FontSize = datePicker.FontSize = fontSize;
         }
 
         private void OnTintColorChanged(Color tintColor)
         {
-            this.datePicker.TintColor = tintColor;
+            datePicker.TintColor = tintColor;
         }
 
         private void OnUnderlineColorChanged(Color underlineColor)
         {
-            if (this.AlwaysShowUnderline)
+            if (AlwaysShowUnderline)
             {
-                this.persistentUnderline.Color = underlineColor;
+                persistentUnderline.Color = underlineColor;
             }
         }
 
         private void SetControl()
         {
-            this.trailingIcon.TintColor = this.TextColor;
+            trailingIcon.TintColor = TextColor;
 
-            this.clearIcon.TintColor = this.TextColor;
-            this.clearIcon.Source = this.ClearIcon;
-            this.clearIcon.GestureRecognizers.Add(new TapGestureRecognizer()
+            clearIcon.TintColor = TextColor;
+            clearIcon.Source = ClearIcon;
+            clearIcon.GestureRecognizers.Add(new TapGestureRecognizer()
             {
                 Command = new Command(() =>
                 {
-                    if (this.Date != null)
+                    if (Date != null)
                     {
-                        this.Date = null;
+                        Date = null;
                     }
                 })
             });
 
-            this.persistentUnderline.Color = this.UnderlineColor;
+            persistentUnderline.Color = UnderlineColor;
 
-            this.tapGesture.Command = new Command(() =>
+            tapGesture.Command = new Command(() =>
             {
-                if (!this.datePicker.IsFocused)
+                if (!datePicker.IsFocused)
                 {
-                    this.datePicker.Focus();
+                    datePicker.Focus();
                 }
             });
         }
@@ -1132,27 +1132,27 @@ private void SetPropertyChangeHandler(ref Dictionary<string, Action> propertyCha
         {
             propertyChangeActions = new Dictionary<string, Action>
             {
-                { nameof(this.Date), () => this.OnDateChanged(this.Date) },
-                { nameof(this.TextColor), () => this.OnTextColorChanged(this.TextColor) },
-                { nameof(this.TextFontFamily), () => this.OnTextFontFamilyChanged(this.TextFontFamily) },
-                { nameof(this.TintColor), () => this.OnTintColorChanged(this.TintColor) },
-                { nameof(this.Placeholder), () => this.OnPlaceholderChanged(this.Placeholder) },
-                { nameof(this.PlaceholderColor), () => this.OnPlaceholderColorChanged(this.PlaceholderColor) },
-                { nameof(this.PlaceholderFontFamily), () => this.OnPlaceholderFontFamilyChanged(this.PlaceholderFontFamily) },
-                { nameof(this.HelperText), () => this.OnHelperTextChanged(this.HelperText) },
-                { nameof(this.HelperTextFontFamily), () => this.OnHelpertTextFontFamilyChanged(this.HelperTextFontFamily) },
-                { nameof(this.HelperTextColor), () => this.OnHelperTextColorChanged(this.HelperTextColor) },
-                { nameof(this.IsEnabled), () => this.OnEnabledChanged(this.IsEnabled) },
-                { nameof(this.BackgroundColor), () => this.OnBackgroundColorChanged(this.BackgroundColor) },
-                { nameof(this.AlwaysShowUnderline), () => this.OnAlwaysShowUnderlineChanged(this.AlwaysShowUnderline) },
-                { nameof(this.ErrorColor), () => this.OnErrorColorChanged(this.ErrorColor) },
-                { nameof(this.UnderlineColor), () => this.OnUnderlineColorChanged(this.UnderlineColor) },
-                { nameof(this.HasError), () => this.OnHasErrorChanged() },
-                { nameof(this.FloatingPlaceholderEnabled), () => this.OnFloatingPlaceholderEnabledChanged(this.FloatingPlaceholderEnabled) },
-                { nameof(this.LeadingIcon), () => this.OnLeadingIconChanged(this.LeadingIcon) },
-                { nameof(this.LeadingIconTintColor), () => this.OnLeadingIconTintColorChanged(this.LeadingIconTintColor) },
-                { nameof(this.TextFontSize), () => this.OnTextFontSizeChanged(this.TextFontSize) },
-                { nameof(this.ErrorText), () => this.OnErrorTextChanged() }
+                { nameof(Date), () => OnDateChanged(Date) },
+                { nameof(TextColor), () => OnTextColorChanged(TextColor) },
+                { nameof(TextFontFamily), () => OnTextFontFamilyChanged(TextFontFamily) },
+                { nameof(TintColor), () => OnTintColorChanged(TintColor) },
+                { nameof(Placeholder), () => OnPlaceholderChanged(Placeholder) },
+                { nameof(PlaceholderColor), () => OnPlaceholderColorChanged(PlaceholderColor) },
+                { nameof(PlaceholderFontFamily), () => OnPlaceholderFontFamilyChanged(PlaceholderFontFamily) },
+                { nameof(HelperText), () => OnHelperTextChanged(HelperText) },
+                { nameof(HelperTextFontFamily), () => OnHelpertTextFontFamilyChanged(HelperTextFontFamily) },
+                { nameof(HelperTextColor), () => OnHelperTextColorChanged(HelperTextColor) },
+                { nameof(IsEnabled), () => OnEnabledChanged(IsEnabled) },
+                { nameof(BackgroundColor), () => OnBackgroundColorChanged(BackgroundColor) },
+                { nameof(AlwaysShowUnderline), () => OnAlwaysShowUnderlineChanged(AlwaysShowUnderline) },
+                { nameof(ErrorColor), () => OnErrorColorChanged(ErrorColor) },
+                { nameof(UnderlineColor), () => OnUnderlineColorChanged(UnderlineColor) },
+                { nameof(HasError), () => OnHasErrorChanged() },
+                { nameof(FloatingPlaceholderEnabled), () => OnFloatingPlaceholderEnabledChanged(FloatingPlaceholderEnabled) },
+                { nameof(LeadingIcon), () => OnLeadingIconChanged(LeadingIcon) },
+                { nameof(LeadingIconTintColor), () => OnLeadingIconTintColorChanged(LeadingIconTintColor) },
+                { nameof(TextFontSize), () => OnTextFontSizeChanged(TextFontSize) },
+                { nameof(ErrorText), () => OnErrorTextChanged() }
             };
         }
     }
diff --git a/XF.Material/UI/MaterialElevation.cs b/XF.Material/UI/MaterialElevation.cs
index 713134dc..4981fa02 100644
--- a/XF.Material/UI/MaterialElevation.cs
+++ b/XF.Material/UI/MaterialElevation.cs
@@ -15,8 +15,8 @@ public MaterialElevation(int uniformElevation) : this(uniformElevation, uniformE
 
         public MaterialElevation(int restingElevation, int pressedElevation)
         {
-            this.RestingElevation = restingElevation;
-            this.PressedElevation = pressedElevation;
+            RestingElevation = restingElevation;
+            PressedElevation = pressedElevation;
         }
 
         public static implicit operator MaterialElevation(int uniformElevation) => new MaterialElevation(uniformElevation);
@@ -28,7 +28,10 @@ public class MaterialElevationTypeConverter : TypeConverter
         public override object ConvertFromInvariantString(string value)
         {
             if (value == null)
+            {
                 throw new InvalidOperationException($"Cannot convert {value} to {typeof(MaterialElevation)}");
+            }
+
             value = value.Trim();
 
             if (value.Contains(","))
diff --git a/XF.Material/UI/MaterialHorizontalThickness.cs b/XF.Material/UI/MaterialHorizontalThickness.cs
index 79aa6e20..29e7a96c 100644
--- a/XF.Material/UI/MaterialHorizontalThickness.cs
+++ b/XF.Material/UI/MaterialHorizontalThickness.cs
@@ -10,15 +10,15 @@ public struct MaterialHorizontalThickness
     {
         public MaterialHorizontalThickness(double left, double right)
         {
-            this.Left = left;
-            this.Right = right;
+            Left = left;
+            Right = right;
         }
 
         public MaterialHorizontalThickness(double uniformSize) : this(uniformSize, uniformSize)
         {
         }
 
-        public bool IsUniformSize => this.Left == this.Right;
+        public bool IsUniformSize => Left == Right;
 
         public double Left { get; }
 
@@ -33,7 +33,10 @@ public class MaterialHorizontalThicknessTypeConverter : TypeConverter
         public override object ConvertFromInvariantString(string value)
         {
             if (value == null)
+            {
                 throw new InvalidOperationException($"Cannot convert {value} to {typeof(MaterialHorizontalThickness)}");
+            }
+
             value = value.Trim();
 
             if (value.Contains(","))
diff --git a/XF.Material/UI/MaterialIcon.cs b/XF.Material/UI/MaterialIcon.cs
index 13d76b53..ca889536 100644
--- a/XF.Material/UI/MaterialIcon.cs
+++ b/XF.Material/UI/MaterialIcon.cs
@@ -17,8 +17,8 @@ public class MaterialIcon : Image, IMaterialTintableControl
         /// </summary>
         public Color TintColor
         {
-            get => (Color)this.GetValue(TintColorProperty);
-            set => this.SetValue(TintColorProperty, value);
+            get => (Color)GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
         }
     }
 }
diff --git a/XF.Material/UI/MaterialIconButton.xaml.cs b/XF.Material/UI/MaterialIconButton.xaml.cs
index 56d6d7e8..f59ed816 100644
--- a/XF.Material/UI/MaterialIconButton.xaml.cs
+++ b/XF.Material/UI/MaterialIconButton.xaml.cs
@@ -12,7 +12,7 @@ namespace XF.Material.Forms.UI
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class MaterialIconButton : ContentView, IMaterialButtonControl, IMaterialTintableControl
     {
-        public new static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(MaterialButton), Material.Color.Secondary);
+        public static new readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(MaterialButton), Material.Color.Secondary);
 
         public static readonly BindableProperty BorderColorProperty = BindableProperty.Create(nameof(BorderColor), typeof(Color), typeof(MaterialIconButton), Color.Default);
 
@@ -40,22 +40,22 @@ public partial class MaterialIconButton : ContentView, IMaterialButtonControl, I
 
         public MaterialIconButton()
         {
-            this.InitializeComponent();
-            this.SetDynamicResource(WidthRequestProperty, MaterialConstants.MATERIAL_BUTTON_HEIGHT);
-            this.SetDynamicResource(HeightRequestProperty, MaterialConstants.MATERIAL_BUTTON_HEIGHT);
+            InitializeComponent();
+            SetDynamicResource(WidthRequestProperty, MaterialConstants.MATERIAL_BUTTON_HEIGHT);
+            SetDynamicResource(HeightRequestProperty, MaterialConstants.MATERIAL_BUTTON_HEIGHT);
 
-            _button.Command = new Command(() => this.OnButtonClicked(true));
+            _button.Command = new Command(() => OnButtonClicked(true));
             _propertyChangeActions = new Dictionary<string, Action>
             {
-                { nameof(this.BorderColor), () => this.OnBorderColorChanged(this.BorderColor) },
-                { nameof(this.BorderWidth), () => this.OnBorderWidthChanged(this.BorderWidth) },
-                { nameof(this.ButtonType), () => this.OnButtonTypeChanged(this.ButtonType) },
-                { nameof(this.CornerRadius), () => this.OnCornerRadiusChanged(this.CornerRadius) },
-                { nameof(this.DisabledBackgroundColor), () => this.OnDisabledBackgroundColorChanged(this.DisabledBackgroundColor) },
-                { nameof(this.Image), () => this.OnImageChanged(this.Image) },
-                { nameof(this.PressedBackgroundColor), () => this.OnPressedBackgroundColorChanged(this.PressedBackgroundColor) },
-                { nameof(this.TintColor), () => this.OnTintColorChanged(this.TintColor) },
-                { nameof(this.Elevation), () => this.OnElevationChanged(this.Elevation) },
+                { nameof(BorderColor), () => OnBorderColorChanged(BorderColor) },
+                { nameof(BorderWidth), () => OnBorderWidthChanged(BorderWidth) },
+                { nameof(ButtonType), () => OnButtonTypeChanged(ButtonType) },
+                { nameof(CornerRadius), () => OnCornerRadiusChanged(CornerRadius) },
+                { nameof(DisabledBackgroundColor), () => OnDisabledBackgroundColorChanged(DisabledBackgroundColor) },
+                { nameof(Image), () => OnImageChanged(Image) },
+                { nameof(PressedBackgroundColor), () => OnPressedBackgroundColorChanged(PressedBackgroundColor) },
+                { nameof(TintColor), () => OnTintColorChanged(TintColor) },
+                { nameof(Elevation), () => OnElevationChanged(Elevation) },
             };
         }
 
@@ -63,62 +63,62 @@ public MaterialIconButton()
 
         public new Color BackgroundColor
         {
-            get => (Color)this.GetValue(BackgroundColorProperty);
-            set => this.SetValue(BackgroundColorProperty, value);
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
         }
 
         public Color BorderColor
         {
-            get => (Color)this.GetValue(BorderColorProperty);
-            set => this.SetValue(BorderColorProperty, value);
+            get => (Color)GetValue(BorderColorProperty);
+            set => SetValue(BorderColorProperty, value);
         }
 
         public double BorderWidth
         {
-            get => (double)this.GetValue(BorderWidthProperty);
-            set => this.SetValue(BorderWidthProperty, value);
+            get => (double)GetValue(BorderWidthProperty);
+            set => SetValue(BorderWidthProperty, value);
         }
 
         public MaterialButtonType ButtonType
         {
-            get => (MaterialButtonType)this.GetValue(ButtonTypeProperty);
-            set => this.SetValue(ButtonTypeProperty, value);
+            get => (MaterialButtonType)GetValue(ButtonTypeProperty);
+            set => SetValue(ButtonTypeProperty, value);
         }
 
         public ICommand Command
         {
-            get => (ICommand)this.GetValue(CommandProperty);
-            set => this.SetValue(CommandProperty, value);
+            get => (ICommand)GetValue(CommandProperty);
+            set => SetValue(CommandProperty, value);
         }
 
         public object CommandParameter
         {
-            get => this.GetValue(CommandParameterProperty);
-            set => this.SetValue(CommandParameterProperty, value);
+            get => GetValue(CommandParameterProperty);
+            set => SetValue(CommandParameterProperty, value);
         }
 
         public int CornerRadius
         {
-            get => (int)this.GetValue(CornerRadiusProperty);
-            set => this.SetValue(CornerRadiusProperty, value);
+            get => (int)GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
         }
 
         public Color DisabledBackgroundColor
         {
-            get => (Color)this.GetValue(DisabledBackgroundColorProperty);
-            set => this.SetValue(DisabledBackgroundColorProperty, value);
+            get => (Color)GetValue(DisabledBackgroundColorProperty);
+            set => SetValue(DisabledBackgroundColorProperty, value);
         }
 
         public MaterialElevation Elevation
         {
-            get => (MaterialElevation)this.GetValue(ElevationProperty);
-            set => this.SetValue(ElevationProperty, value);
+            get => (MaterialElevation)GetValue(ElevationProperty);
+            set => SetValue(ElevationProperty, value);
         }
 
         public string Image
         {
-            get => (string)this.GetValue(ImageProperty);
-            set => this.SetValue(ImageProperty, value);
+            get => (string)GetValue(ImageProperty);
+            set => SetValue(ImageProperty, value);
         }
 
         /// <summary>
@@ -129,39 +129,42 @@ public string Image
 
         public Color PressedBackgroundColor
         {
-            get => (Color)this.GetValue(PressedBackgroundColorProperty);
-            set => this.SetValue(PressedBackgroundColorProperty, value);
+            get => (Color)GetValue(PressedBackgroundColorProperty);
+            set => SetValue(PressedBackgroundColorProperty, value);
         }
 
         public Color TintColor
         {
-            get => (Color)this.GetValue(TintColorProperty);
-            set => this.SetValue(TintColorProperty, value);
+            get => (Color)GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
         }
 
         protected virtual void OnButtonClicked(bool handled)
         {
-            this.Clicked?.Invoke(this, EventArgs.Empty);
-            this.InternalCommand?.Execute(null);
+            Clicked?.Invoke(this, EventArgs.Empty);
+            InternalCommand?.Execute(null);
 
-            if (handled && this.Command?.CanExecute(this.CommandParameter) == true)
+            if (handled && Command?.CanExecute(CommandParameter) == true)
             {
-                this.Command.Execute(this.CommandParameter);
+                Command.Execute(CommandParameter);
             }
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            if (propertyName == nameof(this.BackgroundColor))
+            if (propertyName == nameof(BackgroundColor))
             {
-                _button.BackgroundColor = this.BackgroundColor;
+                _button.BackgroundColor = BackgroundColor;
 
                 return;
             }
 
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == null) return;
+            if (propertyName == null)
+            {
+                return;
+            }
 
             if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(propertyName, out var handlePropertyChange))
             {
diff --git a/XF.Material/UI/MaterialLabel.cs b/XF.Material/UI/MaterialLabel.cs
index 81007bd0..c3496377 100644
--- a/XF.Material/UI/MaterialLabel.cs
+++ b/XF.Material/UI/MaterialLabel.cs
@@ -20,7 +20,7 @@ public class MaterialLabel : Label
 
         public MaterialLabel()
         {
-            this.SetDynamicResource(LineHeightProperty, "Material.LineHeight");
+            SetDynamicResource(LineHeightProperty, "Material.LineHeight");
         }
 
         /// <summary>
@@ -28,8 +28,8 @@ public MaterialLabel()
         /// </summary>
         public double LetterSpacing
         {
-            get => (double)this.GetValue(LetterSpacingProperty);
-            set => this.SetValue(LetterSpacingProperty, value);
+            get => (double)GetValue(LetterSpacingProperty);
+            set => SetValue(LetterSpacingProperty, value);
         }
 
         /// <summary>
@@ -37,8 +37,8 @@ public double LetterSpacing
         /// </summary>
         public MaterialTypeScale TypeScale
         {
-            get => (MaterialTypeScale)this.GetValue(TypeScaleProperty);
-            set => this.SetValue(TypeScaleProperty, value);
+            get => (MaterialTypeScale)GetValue(TypeScaleProperty);
+            set => SetValue(TypeScaleProperty, value);
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
@@ -47,19 +47,19 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
             switch (propertyName)
             {
-                case nameof(this.TypeScale):
-                    this.OnTypeScaleChanged(this.TypeScale);
+                case nameof(TypeScale):
+                    OnTypeScaleChanged(TypeScale);
                     break;
-                case nameof(this.FontSize):
+                case nameof(FontSize):
                     _fontSizeChanged = true;
                     break;
-                case nameof(this.FontFamily):
+                case nameof(FontFamily):
                     _fontFamilyChanged = true;
                     break;
-                case nameof(this.LetterSpacing):
+                case nameof(LetterSpacing):
                     _letterSpacingChanged = true;
                     break;
-                case nameof(this.FontAttributes):
+                case nameof(FontAttributes):
                     _fontAttributeChanged = true;
                     break;
             }
@@ -74,26 +74,30 @@ protected virtual void OnTypeScaleChanged(MaterialTypeScale materialTypeScale)
             if (!_letterSpacingChanged)
             {
                 var letterSpacingKey = $"Material.LetterSpacing.{materialTypeScale.ToString()}";
-                this.LetterSpacing = Convert.ToDouble(Application.Current.Resources[letterSpacingKey]);
+                LetterSpacing = Convert.ToDouble(Application.Current.Resources[letterSpacingKey]);
             }
             if (!_fontFamilyChanged)
             {
                 var fontFamilyKey = $"Material.FontFamily.{materialTypeScale.ToString()}";
-                this.FontFamily = Application.Current.Resources[fontFamilyKey]?.ToString();
+                FontFamily = Application.Current.Resources[fontFamilyKey]?.ToString();
             }
             if (!_fontSizeChanged)
             {
                 var fontSizeKey = $"Material.FontSize.{materialTypeScale.ToString()}";
-                this.FontSize = Convert.ToDouble(Application.Current.Resources[fontSizeKey]);
+                FontSize = Convert.ToDouble(Application.Current.Resources[fontSizeKey]);
+            }
+
+            if (_fontAttributeChanged)
+            {
+                return;
             }
 
-            if (_fontAttributeChanged) return;
             switch (materialTypeScale)
             {
                 case MaterialTypeScale.H6:
                 case MaterialTypeScale.Subtitle2:
                 case MaterialTypeScale.Button:
-                    this.FontAttributes = FontAttributes.Bold;
+                    FontAttributes = FontAttributes.Bold;
                     break;
             }
         }
diff --git a/XF.Material/UI/MaterialMenuButton.cs b/XF.Material/UI/MaterialMenuButton.cs
index a8489780..028e92e4 100644
--- a/XF.Material/UI/MaterialMenuButton.cs
+++ b/XF.Material/UI/MaterialMenuButton.cs
@@ -33,12 +33,12 @@ public class MaterialMenuButton : MaterialIconButton
         /// <summary>
         /// Backing field for the bindable property <see cref="CommandParameter"/>.
         /// </summary>
-        public new static readonly BindableProperty CommandParameterProperty = BindableProperty.Create(nameof(CommandParameter), typeof(object), typeof(MaterialMenuButton));
+        public static new readonly BindableProperty CommandParameterProperty = BindableProperty.Create(nameof(CommandParameter), typeof(object), typeof(MaterialMenuButton));
 
         /// <summary>
         /// Backing field for the bindable property <see cref="Command"/>.
         /// </summary>
-        public new static readonly BindableProperty CommandProperty = BindableProperty.Create(nameof(Command), typeof(Command<MaterialMenuResult>), typeof(MaterialMenuButton));
+        public static new readonly BindableProperty CommandProperty = BindableProperty.Create(nameof(Command), typeof(Command<MaterialMenuResult>), typeof(MaterialMenuButton));
 
         /// <summary>
         /// Backing field for the bindable property <see cref="MenuTextColor"/>.
@@ -60,8 +60,8 @@ public class MaterialMenuButton : MaterialIconButton
         /// </summary>
         public IList Choices
         {
-            get => (IList)this.GetValue(ChoicesProperty);
-            set => this.SetValue(ChoicesProperty, value);
+            get => (IList)GetValue(ChoicesProperty);
+            set => SetValue(ChoicesProperty, value);
         }
 
         /// <summary>
@@ -69,8 +69,8 @@ public IList Choices
         /// </summary>
         public Color MenuBackgroundColor
         {
-            get => (Color)this.GetValue(MenuBackgroundColorProperty);
-            set => this.SetValue(MenuBackgroundColorProperty, value);
+            get => (Color)GetValue(MenuBackgroundColorProperty);
+            set => SetValue(MenuBackgroundColorProperty, value);
         }
 
         /// <summary>
@@ -78,8 +78,8 @@ public Color MenuBackgroundColor
         /// </summary>
         public float MenuCornerRadius
         {
-            get => (float)this.GetValue(MenuCornerRadiusProperty);
-            set => this.SetValue(MenuCornerRadiusProperty, value);
+            get => (float)GetValue(MenuCornerRadiusProperty);
+            set => SetValue(MenuCornerRadiusProperty, value);
         }
 
         /// <summary>
@@ -87,8 +87,8 @@ public float MenuCornerRadius
         /// </summary>
         public new Command<MaterialMenuResult> Command
         {
-            get => (Command<MaterialMenuResult>)this.GetValue(CommandProperty);
-            set => this.SetValue(CommandProperty, value);
+            get => (Command<MaterialMenuResult>)GetValue(CommandProperty);
+            set => SetValue(CommandProperty, value);
         }
 
         /// <summary>
@@ -96,8 +96,8 @@ public float MenuCornerRadius
         /// </summary>
         public new object CommandParameter
         {
-            get => this.GetValue(CommandParameterProperty);
-            set => this.SetValue(CommandParameterProperty, value);
+            get => GetValue(CommandParameterProperty);
+            set => SetValue(CommandParameterProperty, value);
         }
 
         /// <summary>
@@ -105,14 +105,14 @@ public float MenuCornerRadius
         /// </summary>
         public Color MenuTextColor
         {
-            get => (Color)this.GetValue(MenuTextColorProperty);
-            set => this.SetValue(MenuTextColorProperty, value);
+            get => (Color)GetValue(MenuTextColorProperty);
+            set => SetValue(MenuTextColorProperty, value);
         }
 
         public string MenuTextFontFamily
         {
-            get => (string)this.GetValue(MenuTextFontFamilyProperty);
-            set => this.SetValue(MenuTextFontFamilyProperty, value);
+            get => (string)GetValue(MenuTextFontFamilyProperty);
+            set => SetValue(MenuTextFontFamilyProperty, value);
         }
 
         protected override void OnButtonClicked(bool handled)
@@ -126,30 +126,30 @@ protected override void OnButtonClicked(bool handled)
         [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual void OnViewTouch(double x, double y)
         {
-            if (this.Choices == null || this.Choices?.Count == 0)
+            if (Choices == null || Choices?.Count == 0)
             {
                 throw new InvalidOperationException("Cannot show menu, property Choices is null or has no items");
             }
 
-            var dimension = new MaterialMenuDimension(x, y, this.Width, this.Height);
+            var dimension = new MaterialMenuDimension(x, y, Width, Height);
 
             Device.BeginInvokeOnMainThread(async () =>
             {
-                var result = await MaterialMenuDialog.ShowAsync(this.CreateMenuItems(), dimension, new MaterialMenuConfiguration
+                var result = await MaterialMenuDialog.ShowAsync(CreateMenuItems(), dimension, new MaterialMenuConfiguration
                 {
-                    CornerRadius = this.MenuCornerRadius,
-                    BackgroundColor = this.MenuBackgroundColor,
-                    TextColor = this.MenuTextColor,
-                    TextFontFamily = this.MenuTextFontFamily
+                    CornerRadius = MenuCornerRadius,
+                    BackgroundColor = MenuBackgroundColor,
+                    TextColor = MenuTextColor,
+                    TextFontFamily = MenuTextFontFamily
                 });
 
                 if (result >= 0)
                 {
-                    this.OnMenuSelected(new MaterialMenuResult(result, this.CommandParameter));
+                    OnMenuSelected(new MaterialMenuResult(result, CommandParameter));
                 }
                 else
                 {
-                    this.OnMenuSelected(new MaterialMenuResult(-1, null));
+                    OnMenuSelected(new MaterialMenuResult(-1, null));
                 }
             });
         }
@@ -160,18 +160,22 @@ public virtual void OnViewTouch(double x, double y)
         /// <param name="result">The result of the selection.</param>
         protected virtual void OnMenuSelected(MaterialMenuResult result)
         {
-            this.Command?.Execute(result);
-            this.MenuSelected?.Invoke(this, new MenuSelectedEventArgs(result));
+            Command?.Execute(result);
+            MenuSelected?.Invoke(this, new MenuSelectedEventArgs(result));
         }
 
         private List<MaterialMenuItem> CreateMenuItems()
         {
             var items = new List<MaterialMenuItem>();
-            var collectionType = this.Choices.Cast<object>().FirstOrDefault()?.GetType();
+            var collectionType = Choices.Cast<object>().FirstOrDefault()?.GetType();
 
             if (collectionType == typeof(MaterialMenuItem))
             {
-                if (!(this.Choices is IList<MaterialMenuItem> result)) return default(List<MaterialMenuItem>);
+                if (!(Choices is IList<MaterialMenuItem> result))
+                {
+                    return default(List<MaterialMenuItem>);
+                }
+
                 items.AddRange(result);
 
                 foreach (var item in items)
@@ -181,7 +185,7 @@ private List<MaterialMenuItem> CreateMenuItems()
             }
             else
             {
-                items.AddRange(from object item in this.Choices select new MaterialMenuItem { Text = item.ToString(), Index = this.Choices.IndexOf(item) });
+                items.AddRange(from object item in Choices select new MaterialMenuItem { Text = item.ToString(), Index = Choices.IndexOf(item) });
             }
 
             return items;
diff --git a/XF.Material/UI/MaterialNavigationPage.cs b/XF.Material/UI/MaterialNavigationPage.cs
index f53d5731..98f33bf2 100644
--- a/XF.Material/UI/MaterialNavigationPage.cs
+++ b/XF.Material/UI/MaterialNavigationPage.cs
@@ -59,9 +59,9 @@ public MaterialNavigationPage(Page rootPage) : base(rootPage)
                 rootPage.SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.BACKGROUND);
             }
 
-            this.ChangeFont(rootPage);
-            this.ChangeBarTextColor(rootPage);
-            this.ChangeBarBackgroundColor(rootPage);
+            ChangeFont(rootPage);
+            ChangeBarTextColor(rootPage);
+            ChangeBarBackgroundColor(rootPage);
         }
 
         /// <summary>
@@ -179,7 +179,7 @@ public static void SetStatusBarColor(BindableObject view, Color color)
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void InternalPagePop(Page previousPage, Page poppedPage)
         {
-            this.OnPagePop(previousPage, poppedPage);
+            OnPagePop(previousPage, poppedPage);
         }
 
         /// <summary>
@@ -188,16 +188,16 @@ public void InternalPagePop(Page previousPage, Page poppedPage)
         [EditorBrowsable(EditorBrowsableState.Never)]
         public void InternalPagePush(Page page)
         {
-            this.OnPagePush(page);
+            OnPagePush(page);
         }
 
         protected override void OnPropertyChanging([CallerMemberName] string propertyName = null)
         {
             base.OnPropertyChanging(propertyName);
 
-            if (propertyName == nameof(this.CurrentPage) && this.CurrentPage != null)
+            if (propertyName == nameof(CurrentPage) && CurrentPage != null)
             {
-                this.CurrentPage.PropertyChanged -= this.Page_PropertyChanged;
+                CurrentPage.PropertyChanged -= Page_PropertyChanged;
             }
         }
 
@@ -205,9 +205,9 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == nameof(this.CurrentPage) && this.CurrentPage != null)
+            if (propertyName == nameof(CurrentPage) && CurrentPage != null)
             {
-                this.CurrentPage.PropertyChanged += this.Page_PropertyChanged;
+                CurrentPage.PropertyChanged += Page_PropertyChanged;
             }
         }
 
@@ -215,7 +215,7 @@ private void Page_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             var page = sender as Page;
 
-            if (e?.PropertyName == nameof(this.Title) && page?.GetValue(TitleViewProperty) is TitleLabel label)
+            if (e?.PropertyName == nameof(Title) && page?.GetValue(TitleViewProperty) is TitleLabel label)
             {
                 label.Text = page.Title;
             }
@@ -225,8 +225,12 @@ protected override void OnAppearing()
         {
             base.OnAppearing();
 
-            if (_firstLoad) return;
-            ChangeStatusBarColor(this.RootPage);
+            if (_firstLoad)
+            {
+                return;
+            }
+
+            ChangeStatusBarColor(RootPage);
 
             _firstLoad = true;
         }
@@ -243,9 +247,9 @@ protected virtual void OnPagePop(Page previousPage, Page poppedPage)
                 previousPage.SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.BACKGROUND);
             }
 
-            this.ChangeBarTextColor(previousPage);
+            ChangeBarTextColor(previousPage);
             ChangeStatusBarColor(previousPage);
-            this.ChangeBarBackgroundColor(previousPage);
+            ChangeBarBackgroundColor(previousPage);
 
             previousPage.SetValue(BackButtonTitleProperty, string.Empty);
         }
@@ -261,10 +265,10 @@ protected virtual void OnPagePush(Page page)
                 page.SetDynamicResource(BackgroundColorProperty, MaterialConstants.Color.BACKGROUND);
             }
 
-            this.ChangeFont(page);
-            this.ChangeBarTextColor(page);
+            ChangeFont(page);
+            ChangeBarTextColor(page);
             ChangeStatusBarColor(page);
-            this.ChangeBarBackgroundColor(page);
+            ChangeBarBackgroundColor(page);
 
             page.SetValue(BackButtonTitleProperty, string.Empty);
         }
@@ -275,11 +279,11 @@ private void ChangeBarBackgroundColor(Page page)
 
             if (barColor.IsDefault)
             {
-                this.SetDynamicResource(BarBackgroundColorProperty, MaterialConstants.Color.PRIMARY);
+                SetDynamicResource(BarBackgroundColorProperty, MaterialConstants.Color.PRIMARY);
             }
             else
             {
-                this.BarBackgroundColor = barColor;
+                BarBackgroundColor = barColor;
             }
         }
 
@@ -291,16 +295,16 @@ private void ChangeBarTextColor(Page page)
             {
                 if (barTextColor.IsDefault)
                 {
-                    this.BarTextColor = customTitleView.TextColor = Material.Color.OnPrimary;
+                    BarTextColor = customTitleView.TextColor = Material.Color.OnPrimary;
                 }
                 else
                 {
-                    this.BarTextColor = customTitleView.TextColor = barTextColor;
+                    BarTextColor = customTitleView.TextColor = barTextColor;
                 }
             }
             else
             {
-                this.BarTextColor = barTextColor.IsDefault ? Material.Color.OnPrimary : barTextColor;
+                BarTextColor = barTextColor.IsDefault ? Material.Color.OnPrimary : barTextColor;
             }
         }
 
@@ -327,9 +331,9 @@ private void ChangeFont(Page page)
             switch (Device.RuntimePlatform)
             {
                 case Device.iOS:
-                    _customTitleView.Margin = this.Navigation.NavigationStack.Count == 1 ? new Thickness(8, 0, 8, 0) : new Thickness(8, 0, 32, 0);
+                    _customTitleView.Margin = Navigation.NavigationStack.Count == 1 ? new Thickness(8, 0, 8, 0) : new Thickness(8, 0, 32, 0);
                     break;
-                case Device.Android when this.Navigation.NavigationStack.Count > 1 && page.ToolbarItems.Count == 0:
+                case Device.Android when Navigation.NavigationStack.Count > 1 && page.ToolbarItems.Count == 0:
                     _customTitleView.Margin = new Thickness(0, 0, 72, 0);
                     break;
             }
diff --git a/XF.Material/UI/MaterialRadioButtonGroup.xaml.cs b/XF.Material/UI/MaterialRadioButtonGroup.xaml.cs
index 38e87f54..0c674b31 100644
--- a/XF.Material/UI/MaterialRadioButtonGroup.xaml.cs
+++ b/XF.Material/UI/MaterialRadioButtonGroup.xaml.cs
@@ -32,7 +32,7 @@ public partial class MaterialRadioButtonGroup : BaseMaterialSelectionControlGrou
         /// </summary>
         public MaterialRadioButtonGroup()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         /// <summary>
@@ -41,8 +41,8 @@ public MaterialRadioButtonGroup()
         /// <param name="choices">The list of string which the user will choose from.</param>
         public MaterialRadioButtonGroup(IList<string> choices)
         {
-            this.InitializeComponent();
-            this.Choices = choices;
+            InitializeComponent();
+            Choices = choices;
         }
 
         /// <summary>
@@ -55,8 +55,8 @@ public MaterialRadioButtonGroup(IList<string> choices)
         /// </summary>
         public int SelectedIndex
         {
-            get => (int)this.GetValue(SelectedIndexProperty);
-            set => this.SetValue(SelectedIndexProperty, value);
+            get => (int)GetValue(SelectedIndexProperty);
+            set => SetValue(SelectedIndexProperty, value);
         }
 
         /// <summary>
@@ -64,8 +64,8 @@ public int SelectedIndex
         /// </summary>
         public Command<int> SelectedIndexChangedCommand
         {
-            get => (Command<int>)this.GetValue(SelectedIndexChangedCommandProperty);
-            set => this.SetValue(SelectedIndexChangedCommandProperty, value);
+            get => (Command<int>)GetValue(SelectedIndexChangedCommandProperty);
+            set => SetValue(SelectedIndexChangedCommandProperty, value);
         }
 
         internal override ObservableCollection<MaterialSelectionControlModel> Models => selectionList.GetValue(BindableLayout.ItemsSourceProperty) as ObservableCollection<MaterialSelectionControlModel>;
@@ -74,14 +74,14 @@ protected override void CreateChoices()
         {
             var models = new ObservableCollection<MaterialSelectionControlModel>();
 
-            for (var i = 0; i < this.Choices.Count; i++)
+            for (var i = 0; i < Choices.Count; i++)
             {
                 var model = new MaterialSelectionControlModel
                 {
                     Index = i,
-                    Text = this.Choices[i]
+                    Text = Choices[i]
                 };
-                model.SelectedChangeCommand = new Command<bool>((isSelected) => this.RadioButtonSelected(isSelected, model));
+                model.SelectedChangeCommand = new Command<bool>((isSelected) => RadioButtonSelected(isSelected, model));
 
                 models.Add(model);
             }
@@ -91,9 +91,9 @@ protected override void CreateChoices()
 
         protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
         {
-            if (Math.Abs(widthConstraint * heightConstraint) > float.MinValue && this.SelectedIndex >= 0)
+            if (Math.Abs(widthConstraint * heightConstraint) > float.MinValue && SelectedIndex >= 0)
             {
-                _selectedModel = this.Models[this.SelectedIndex];
+                _selectedModel = Models[SelectedIndex];
             }
 
             return base.OnMeasure(widthConstraint, heightConstraint);
@@ -103,14 +103,18 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName != nameof(this.SelectedIndex)) return;
-            if (this.SelectedIndex >= 0 && this.Models?.Any() == true)
+            if (propertyName != nameof(SelectedIndex))
             {
-                var model = this.Models[this.SelectedIndex];
+                return;
+            }
+
+            if (SelectedIndex >= 0 && Models?.Any() == true)
+            {
+                var model = Models[SelectedIndex];
                 model.IsSelected = true;
             }
 
-            this.OnSelectedIndexChanged(this.SelectedIndex);
+            OnSelectedIndexChanged(SelectedIndex);
         }
 
         /// <summary>
@@ -119,15 +123,15 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         /// <param name="selectedIndex">The new selected index.</param>
         protected virtual void OnSelectedIndexChanged(int selectedIndex)
         {
-            this.SelectedIndexChangedCommand?.Execute(selectedIndex);
-            this.SelectedIndexChanged?.Invoke(this, new SelectedIndexChangedEventArgs(selectedIndex));
+            SelectedIndexChangedCommand?.Execute(selectedIndex);
+            SelectedIndexChanged?.Invoke(this, new SelectedIndexChangedEventArgs(selectedIndex));
         }
 
         private void RadioButtonSelected(bool isSelected, MaterialSelectionControlModel model)
         {
             if (isSelected)
             {
-                this.SelectedIndex = model.Index;
+                SelectedIndex = model.Index;
 
                 if (_selectedModel == model)
                 {
diff --git a/XF.Material/UI/MaterialSlider.xaml.cs b/XF.Material/UI/MaterialSlider.xaml.cs
index 75a66b8b..4839541c 100644
--- a/XF.Material/UI/MaterialSlider.xaml.cs
+++ b/XF.Material/UI/MaterialSlider.xaml.cs
@@ -55,7 +55,7 @@ public partial class MaterialSlider : ContentView, IMaterialElementConfiguration
         /// </summary>
         public MaterialSlider()
         {
-            this.InitializeComponent();
+            InitializeComponent();
         }
 
         /// <summary>
@@ -68,8 +68,8 @@ public MaterialSlider()
         /// </summary>
         public double MaxValue
         {
-            get => (double)this.GetValue(MaxValueProperty);
-            set => this.SetValue(MaxValueProperty, value);
+            get => (double)GetValue(MaxValueProperty);
+            set => SetValue(MaxValueProperty, value);
         }
 
         /// <summary>
@@ -77,8 +77,8 @@ public double MaxValue
         /// </summary>
         public double MinValue
         {
-            get => (double)this.GetValue(MinValueProperty);
-            set => this.SetValue(MinValueProperty, value);
+            get => (double)GetValue(MinValueProperty);
+            set => SetValue(MinValueProperty, value);
         }
 
         /// <summary>
@@ -86,8 +86,8 @@ public double MinValue
         /// </summary>
         public Color ThumbColor
         {
-            get => (Color)this.GetValue(ThumbColorProperty);
-            set => this.SetValue(ThumbColorProperty, value);
+            get => (Color)GetValue(ThumbColorProperty);
+            set => SetValue(ThumbColorProperty, value);
         }
 
         /// <summary>
@@ -95,8 +95,8 @@ public Color ThumbColor
         /// </summary>
         public Color TrackColor
         {
-            get => (Color)this.GetValue(TrackColorProperty);
-            set => this.SetValue(TrackColorProperty, value);
+            get => (Color)GetValue(TrackColorProperty);
+            set => SetValue(TrackColorProperty, value);
         }
 
         /// <summary>
@@ -104,17 +104,17 @@ public Color TrackColor
         /// </summary>
         public double Value
         {
-            get => (double)this.GetValue(ValueProperty);
+            get => (double)GetValue(ValueProperty);
             set
             {
-                var oldVal = (double)this.GetValue(ValueProperty);
+                var oldVal = (double)GetValue(ValueProperty);
 
                 if (Math.Abs(oldVal - value) > float.MinValue)
                 {
-                    this.OnValueChanged(oldVal, value);
+                    OnValueChanged(oldVal, value);
                 }
 
-                this.SetValue(ValueProperty, value);
+                SetValue(ValueProperty, value);
             }
         }
 
@@ -123,8 +123,8 @@ public double Value
         /// </summary>
         public Command<double> ValueChangedCommand
         {
-            get => (Command<double>)this.GetValue(ValueChangedCommandProperty);
-            set => this.SetValue(ValueChangedCommandProperty, value);
+            get => (Command<double>)GetValue(ValueChangedCommandProperty);
+            set => SetValue(ValueChangedCommandProperty, value);
         }
 
         /// <inheritdoc />
@@ -137,16 +137,16 @@ public void ElementChanged(bool created)
             if (created)
             {
                 _pan = new PanGestureRecognizer();
-                _pan.PanUpdated += this.Pan_PanUpdated;
+                _pan.PanUpdated += Pan_PanUpdated;
 
-                this.GestureRecognizers.Add(_pan);
-                TapContainer.Tapped += this.TapContainer_Tapped;
+                GestureRecognizers.Add(_pan);
+                TapContainer.Tapped += TapContainer_Tapped;
             }
             else
             {
-                _pan.PanUpdated -= this.Pan_PanUpdated;
-                this.GestureRecognizers.Remove(_pan);
-                TapContainer.Tapped -= this.TapContainer_Tapped;
+                _pan.PanUpdated -= Pan_PanUpdated;
+                GestureRecognizers.Remove(_pan);
+                TapContainer.Tapped -= TapContainer_Tapped;
             }
         }
 
@@ -154,8 +154,12 @@ protected override void LayoutChildren(double x, double y, double width, double
         {
             base.LayoutChildren(x, y, width, height);
 
-            if (Math.Abs(width * height) < float.MinValue || !(this.Value > 0) || _draggerTranslatedInitially) return;
-            this.AnimateDragger();
+            if (Math.Abs(width * height) < float.MinValue || !(Value > 0) || _draggerTranslatedInitially)
+            {
+                return;
+            }
+
+            AnimateDragger();
             _x = Dragger.TranslationX;
             _draggerTranslatedInitially = true;
         }
@@ -166,17 +170,17 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
             switch (propertyName)
             {
-                case nameof(this.Value):
-                    this.AnimateDragger();
+                case nameof(Value):
+                    AnimateDragger();
                     break;
-                case nameof(this.ThumbColor):
-                    Dragger.BackgroundColor = this.ThumbColor;
+                case nameof(ThumbColor):
+                    Dragger.BackgroundColor = ThumbColor;
                     break;
-                case nameof(this.TrackColor):
-                    Indicator.Color = Placeholder.Color = this.TrackColor;
+                case nameof(TrackColor):
+                    Indicator.Color = Placeholder.Color = TrackColor;
                     break;
-                case nameof(this.IsEnabled):
-                    this.Opacity = this.IsEnabled ? 1.0 : 0.24;
+                case nameof(IsEnabled):
+                    Opacity = IsEnabled ? 1.0 : 0.24;
                     break;
             }
         }
@@ -185,11 +189,15 @@ protected override void OnSizeAllocated(double width, double height)
         {
             base.OnSizeAllocated(width, height);
 
-            if (Math.Abs(_lastWidth - width) < float.MinValue && Math.Abs(_lastHeight - height) < float.MinValue) return;
+            if (Math.Abs(_lastWidth - width) < float.MinValue && Math.Abs(_lastHeight - height) < float.MinValue)
+            {
+                return;
+            }
+
             _lastWidth = width;
             _lastHeight = height;
 
-            this.AnimateDragger();
+            AnimateDragger();
             _x = Dragger.TranslationX;
         }
 
@@ -200,13 +208,13 @@ protected override void OnSizeAllocated(double width, double height)
         /// <param name="newValue"></param>
         protected virtual void OnValueChanged(double oldValue, double newValue)
         {
-            this.ValueChanged?.Invoke(this, new ValueChangedEventArgs(oldValue, newValue));
-            this.ValueChangedCommand?.Execute(newValue);
+            ValueChanged?.Invoke(this, new ValueChangedEventArgs(oldValue, newValue));
+            ValueChangedCommand?.Execute(newValue);
         }
 
         private void AnimateDragger()
         {
-            var percentage = this.Value / (this.MaxValue - this.MinValue);
+            var percentage = Value / (MaxValue - MinValue);
             Dragger.TranslationX = percentage * Placeholder.Width;
             Indicator.WidthRequest = Dragger.TranslationX;
         }
@@ -219,7 +227,7 @@ private void Pan_PanUpdated(object sender, PanUpdatedEventArgs e)
                     {
                         var newX = Math.Min(_x + e.TotalX, Placeholder.Width) >= 0 ? Math.Min(_x + e.TotalX, Placeholder.Width) : 0;
                         var percentage = newX / Placeholder.Width;
-                        this.Value = (percentage * (this.MaxValue - this.MinValue)) + this.MinValue;
+                        Value = (percentage * (MaxValue - MinValue)) + MinValue;
                         break;
                     }
                 case GestureStatus.Completed:
@@ -230,14 +238,14 @@ private void Pan_PanUpdated(object sender, PanUpdatedEventArgs e)
 
         private void TapContainer_Tapped(object sender, Internals.TappedEventArgs e)
         {
-            if (!this.IsEnabled)
+            if (!IsEnabled)
             {
                 return;
             }
 
             var newX = Math.Min(e.X, Placeholder.Width) >= 0 ? Math.Min(e.X, Placeholder.Width) : 0;
             var percentage = newX / Placeholder.Width;
-            this.Value = (percentage * (this.MaxValue - this.MinValue)) + this.MinValue;
+            Value = (percentage * (MaxValue - MinValue)) + MinValue;
             _x = Dragger.TranslationX;
         }
     }
diff --git a/XF.Material/UI/MaterialSwitch.xaml.cs b/XF.Material/UI/MaterialSwitch.xaml.cs
index 5c2b9c28..bebe1ee3 100644
--- a/XF.Material/UI/MaterialSwitch.xaml.cs
+++ b/XF.Material/UI/MaterialSwitch.xaml.cs
@@ -28,47 +28,47 @@ public partial class MaterialSwitch : ContentView
 
         public MaterialSwitch()
         {
-            this.InitializeComponent();
-            _background.Color = this.IsActivated ? this.ActiveTrackColor : this.InactiveTrackColor;
+            InitializeComponent();
+            _background.Color = IsActivated ? ActiveTrackColor : InactiveTrackColor;
         }
 
         public event EventHandler<ActivatedEventArgs> Activated;
 
         public Color ActiveTrackColor
         {
-            get => (Color)this.GetValue(ActiveTrackColorProperty);
-            set => this.SetValue(ActiveTrackColorProperty, value);
+            get => (Color)GetValue(ActiveTrackColorProperty);
+            set => SetValue(ActiveTrackColorProperty, value);
         }
 
         public Color ActiveThumbColor
         {
-            get => (Color)this.GetValue(ActiveThumbColorProperty);
-            set => this.SetValue(ActiveThumbColorProperty, value);
+            get => (Color)GetValue(ActiveThumbColorProperty);
+            set => SetValue(ActiveThumbColorProperty, value);
         }
 
         public Color InactiveTrackColor
         {
-            get => (Color)this.GetValue(InactiveTrackColorProperty);
-            set => this.SetValue(InactiveTrackColorProperty, value);
+            get => (Color)GetValue(InactiveTrackColorProperty);
+            set => SetValue(InactiveTrackColorProperty, value);
         }
 
         public Color InactiveThumbColor
         {
-            get => (Color)this.GetValue(InactiveThumColorProperty);
-            set => this.SetValue(InactiveThumColorProperty, value);
+            get => (Color)GetValue(InactiveThumColorProperty);
+            set => SetValue(InactiveThumColorProperty, value);
         }
 
         public bool IsActivated
         {
-            get => (bool)this.GetValue(IsActivatedProperty);
-            set => this.SetValue(IsActivatedProperty, value);
+            get => (bool)GetValue(IsActivatedProperty);
+            set => SetValue(IsActivatedProperty, value);
         }
 
         protected virtual void OnActivatedChanged(bool isActivated)
         {
-            this.Activated?.Invoke(this, new ActivatedEventArgs(this.IsActivated));
+            Activated?.Invoke(this, new ActivatedEventArgs(IsActivated));
 
-            Device.BeginInvokeOnMainThread(async () => await this.AnimateSwitchAsync(this.IsActivated));
+            Device.BeginInvokeOnMainThread(async () => await AnimateSwitchAsync(IsActivated));
         }
 
         protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
@@ -77,45 +77,45 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
 
             switch (propertyName)
             {
-                case nameof(this.IsActivated):
-                    this.OnActivatedChanged(this.IsActivated);
+                case nameof(IsActivated):
+                    OnActivatedChanged(IsActivated);
                     break;
-                case nameof(this.ActiveTrackColor):
-                case nameof(this.InactiveTrackColor):
-                    _background.Color = this.IsActivated ? this.ActiveTrackColor : this.InactiveTrackColor;
+                case nameof(ActiveTrackColor):
+                case nameof(InactiveTrackColor):
+                    _background.Color = IsActivated ? ActiveTrackColor : InactiveTrackColor;
                     break;
             }
         }
 
         private async Task AnimateSwitchAsync(bool isActivated)
         {
-            _background.Color = this.IsActivated ? this.ActiveTrackColor : this.InactiveTrackColor;
+            _background.Color = IsActivated ? ActiveTrackColor : InactiveTrackColor;
 
             if (isActivated)
             {
-                await this.AnimateToActivatedState();
+                await AnimateToActivatedState();
             }
             else
             {
-                await this.AnimateToUnactivatedState();
+                await AnimateToUnactivatedState();
             }
         }
 
         private async Task AnimateToActivatedState()
         {
-            _thumb.BackgroundColor = this.ActiveThumbColor;
+            _thumb.BackgroundColor = ActiveThumbColor;
             await _thumb.TranslateTo(16, 0, 150, Easing.SinOut);
         }
 
         private async Task AnimateToUnactivatedState()
         {
-            _thumb.BackgroundColor = this.InactiveThumbColor;
+            _thumb.BackgroundColor = InactiveThumbColor;
             await _thumb.TranslateTo(0, 0, 100, Easing.SinOut);
         }
 
         private void TapGestureRecognizer_Tapped(object sender, EventArgs e)
         {
-            this.IsActivated = !this.IsActivated;
+            IsActivated = !IsActivated;
         }
     }
 }
\ No newline at end of file
diff --git a/XF.Material/UI/MaterialTextField.xaml.cs b/XF.Material/UI/MaterialTextField.xaml.cs
index 8cbb5a7e..46d8bb38 100644
--- a/XF.Material/UI/MaterialTextField.xaml.cs
+++ b/XF.Material/UI/MaterialTextField.xaml.cs
@@ -32,11 +32,13 @@ public partial class MaterialTextField : ContentView, IMaterialElementConfigurat
 
         public static readonly BindableProperty SelectedChoiceProperty = BindableProperty.Create(nameof(SelectedChoice), typeof(object), typeof(MaterialTextField), null, BindingMode.TwoWay, null, propertyChanged: SelectedChoicePropertyChange);
 
-        static void SelectedChoicePropertyChange(BindableObject bindable, object oldValue, object newValue)
+        private static void SelectedChoicePropertyChange(BindableObject bindable, object oldValue, object newValue)
         {
             var control = bindable as MaterialTextField;
             if (control == null)
+            {
                 return;
+            }
 
             if (control.Choices?.Count > 0)
             {
@@ -146,9 +148,9 @@ static void SelectedChoicePropertyChange(BindableObject bindable, object oldValu
         /// </summary>
         public MaterialTextField()
         {
-            this.InitializeComponent();
-            this.SetPropertyChangeHandler(ref _propertyChangeActions);
-            this.SetControl();
+            InitializeComponent();
+            SetPropertyChangeHandler(ref _propertyChangeActions);
+            SetControl();
             _lastDeviceDisplay = DeviceDisplay.MainDisplayInfo;
         }
 
@@ -179,8 +181,8 @@ public MaterialTextField()
         /// </summary>
         public bool AlwaysShowUnderline
         {
-            get => (bool)this.GetValue(AlwaysShowUnderlineProperty);
-            set => this.SetValue(AlwaysShowUnderlineProperty, value);
+            get => (bool)GetValue(AlwaysShowUnderlineProperty);
+            set => SetValue(AlwaysShowUnderlineProperty, value);
         }
 
         /// <summary>
@@ -188,8 +190,8 @@ public bool AlwaysShowUnderline
         /// </summary>
         public new Color BackgroundColor
         {
-            get => (Color)this.GetValue(BackgroundColorProperty);
-            set => this.SetValue(BackgroundColorProperty, value);
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
         }
 
         /// <summary>
@@ -197,14 +199,14 @@ public bool AlwaysShowUnderline
         /// </summary>
         public IList Choices
         {
-            get => (IList)this.GetValue(ChoicesProperty);
-            set => this.SetValue(ChoicesProperty, value);
+            get => (IList)GetValue(ChoicesProperty);
+            set => SetValue(ChoicesProperty, value);
         }
 
         public object SelectedChoice
         {
-            get => (object)this.GetValue(SelectedChoiceProperty);
-            set => this.SetValue(SelectedChoiceProperty, value);
+            get => (object)GetValue(SelectedChoiceProperty);
+            set => SetValue(SelectedChoiceProperty, value);
         }
 
 
@@ -218,8 +220,8 @@ public object SelectedChoice
         /// </summary>
         public ICommand ChoiceSelectedCommand
         {
-            get => (ICommand)this.GetValue(ChoiceSelectedCommandProperty);
-            set => this.SetValue(ChoiceSelectedCommandProperty, value);
+            get => (ICommand)GetValue(ChoiceSelectedCommandProperty);
+            set => SetValue(ChoiceSelectedCommandProperty, value);
         }
 
         /// <summary>
@@ -228,8 +230,8 @@ public ICommand ChoiceSelectedCommand
         /// </summary>
         public Color ErrorColor
         {
-            get => (Color)this.GetValue(ErrorColorProperty);
-            set => this.SetValue(ErrorColorProperty, value);
+            get => (Color)GetValue(ErrorColorProperty);
+            set => SetValue(ErrorColorProperty, value);
         }
 
         /// <summary>
@@ -237,8 +239,8 @@ public Color ErrorColor
         /// </summary>
         public string ErrorText
         {
-            get => (string)this.GetValue(ErrorTextProperty);
-            set => this.SetValue(ErrorTextProperty, value);
+            get => (string)GetValue(ErrorTextProperty);
+            set => SetValue(ErrorTextProperty, value);
         }
 
         /// <summary>
@@ -246,8 +248,8 @@ public string ErrorText
         /// </summary>
         public Color FloatingPlaceholderColor
         {
-            get => (Color)this.GetValue(FloatingPlaceholderColorProperty);
-            set => this.SetValue(FloatingPlaceholderColorProperty, value);
+            get => (Color)GetValue(FloatingPlaceholderColorProperty);
+            set => SetValue(FloatingPlaceholderColorProperty, value);
         }
 
         /// <summary>
@@ -255,8 +257,8 @@ public Color FloatingPlaceholderColor
         /// </summary>
         public bool FloatingPlaceholderEnabled
         {
-            get => (bool)this.GetValue(FloatingPlaceholderEnabledProperty);
-            set => this.SetValue(FloatingPlaceholderEnabledProperty, value);
+            get => (bool)GetValue(FloatingPlaceholderEnabledProperty);
+            set => SetValue(FloatingPlaceholderEnabledProperty, value);
         }
 
         /// <summary>
@@ -264,8 +266,8 @@ public bool FloatingPlaceholderEnabled
         /// </summary>
         public double FloatingPlaceholderFontSize
         {
-            get => (double)this.GetValue(FloatingPlaceholderFontSizeProperty);
-            set => this.SetValue(FloatingPlaceholderFontSizeProperty, value);
+            get => (double)GetValue(FloatingPlaceholderFontSizeProperty);
+            set => SetValue(FloatingPlaceholderFontSizeProperty, value);
         }
 
         /// <summary>
@@ -273,8 +275,8 @@ public double FloatingPlaceholderFontSize
         /// </summary>
         public Command<bool> FocusCommand
         {
-            get => (Command<bool>)this.GetValue(FocusCommandProperty);
-            set => this.SetValue(FocusCommandProperty, value);
+            get => (Command<bool>)GetValue(FocusCommandProperty);
+            set => SetValue(FocusCommandProperty, value);
         }
 
         /// <summary>
@@ -282,8 +284,8 @@ public Command<bool> FocusCommand
         /// </summary>
         public bool HasError
         {
-            get => (bool)this.GetValue(HasErrorProperty);
-            set => this.SetValue(HasErrorProperty, value);
+            get => (bool)GetValue(HasErrorProperty);
+            set => SetValue(HasErrorProperty, value);
         }
 
         /// <summary>
@@ -291,8 +293,8 @@ public bool HasError
         /// </summary>
         public string HelperText
         {
-            get => (string)this.GetValue(HelperTextProperty);
-            set => this.SetValue(HelperTextProperty, value);
+            get => (string)GetValue(HelperTextProperty);
+            set => SetValue(HelperTextProperty, value);
         }
 
         /// <summary>
@@ -300,8 +302,8 @@ public string HelperText
         /// </summary>
         public Color HelperTextColor
         {
-            get => (Color)this.GetValue(HelperTextColorProperty);
-            set => this.SetValue(HelperTextColorProperty, value);
+            get => (Color)GetValue(HelperTextColorProperty);
+            set => SetValue(HelperTextColorProperty, value);
         }
 
         /// <summary>
@@ -309,8 +311,8 @@ public Color HelperTextColor
         /// </summary>
         public string HelperTextFontFamily
         {
-            get => (string)this.GetValue(HelperTextFontFamilyProperty);
-            set => this.SetValue(HelperTextFontFamilyProperty, value);
+            get => (string)GetValue(HelperTextFontFamilyProperty);
+            set => SetValue(HelperTextFontFamilyProperty, value);
         }
 
         /// <summary>
@@ -318,8 +320,8 @@ public string HelperTextFontFamily
         /// </summary>
         public MaterialHorizontalThickness HorizontalPadding
         {
-            get => (MaterialHorizontalThickness)this.GetValue(HorizontalPaddingProperty);
-            set => this.SetValue(HorizontalPaddingProperty, value);
+            get => (MaterialHorizontalThickness)GetValue(HorizontalPaddingProperty);
+            set => SetValue(HorizontalPaddingProperty, value);
         }
 
         /// <summary>
@@ -327,8 +329,8 @@ public MaterialHorizontalThickness HorizontalPadding
         /// </summary>
         public MaterialTextFieldInputType InputType
         {
-            get => (MaterialTextFieldInputType)this.GetValue(InputTypeProperty);
-            set => this.SetValue(InputTypeProperty, value);
+            get => (MaterialTextFieldInputType)GetValue(InputTypeProperty);
+            set => SetValue(InputTypeProperty, value);
         }
 
         /// <summary>
@@ -336,8 +338,8 @@ public MaterialTextFieldInputType InputType
         /// </summary>
         public bool IsAutoCapitalizationEnabled
         {
-            get => (bool)this.GetValue(IsAutoCapitalizationEnabledProperty);
-            set => this.SetValue(IsAutoCapitalizationEnabledProperty, value);
+            get => (bool)GetValue(IsAutoCapitalizationEnabledProperty);
+            set => SetValue(IsAutoCapitalizationEnabledProperty, value);
         }
 
         /// <summary>
@@ -345,8 +347,8 @@ public bool IsAutoCapitalizationEnabled
         /// </summary>
         public bool IsMaxLengthCounterVisible
         {
-            get => (bool)this.GetValue(IsMaxLengthCounterVisibleProperty);
-            set => this.SetValue(IsMaxLengthCounterVisibleProperty, value);
+            get => (bool)GetValue(IsMaxLengthCounterVisibleProperty);
+            set => SetValue(IsMaxLengthCounterVisibleProperty, value);
         }
 
         /// <summary>
@@ -354,8 +356,8 @@ public bool IsMaxLengthCounterVisible
         /// </summary>
         public bool IsSpellCheckEnabled
         {
-            get => (bool)this.GetValue(IsSpellCheckEnabledProperty);
-            set => this.SetValue(IsSpellCheckEnabledProperty, value);
+            get => (bool)GetValue(IsSpellCheckEnabledProperty);
+            set => SetValue(IsSpellCheckEnabledProperty, value);
         }
 
         /// <summary>
@@ -363,8 +365,8 @@ public bool IsSpellCheckEnabled
         /// </summary>
         public bool IsTextPredictionEnabled
         {
-            get => (bool)this.GetValue(IsTextPredictionEnabledProperty);
-            set => this.SetValue(IsTextPredictionEnabledProperty, value);
+            get => (bool)GetValue(IsTextPredictionEnabledProperty);
+            set => SetValue(IsTextPredictionEnabledProperty, value);
         }
 
         /// <summary>
@@ -372,8 +374,8 @@ public bool IsTextPredictionEnabled
         /// </summary>
         public string LeadingIcon
         {
-            get => (string)this.GetValue(LeadingIconProperty);
-            set => this.SetValue(LeadingIconProperty, value);
+            get => (string)GetValue(LeadingIconProperty);
+            set => SetValue(LeadingIconProperty, value);
         }
 
         /// <summary>
@@ -381,8 +383,8 @@ public string LeadingIcon
         /// </summary>
         public Color LeadingIconTintColor
         {
-            get => (Color)this.GetValue(LeadingIconTintColorProperty);
-            set => this.SetValue(LeadingIconTintColorProperty, value);
+            get => (Color)GetValue(LeadingIconTintColorProperty);
+            set => SetValue(LeadingIconTintColorProperty, value);
         }
 
         /// <summary>
@@ -390,8 +392,8 @@ public Color LeadingIconTintColor
         /// </summary>
         public int MaxLength
         {
-            get => (int)this.GetValue(MaxLengthProperty);
-            set => this.SetValue(MaxLengthProperty, value);
+            get => (int)GetValue(MaxLengthProperty);
+            set => SetValue(MaxLengthProperty, value);
         }
 
         /// <summary>
@@ -399,15 +401,15 @@ public int MaxLength
         /// </summary>
         public string Placeholder
         {
-            get => (string)this.GetValue(PlaceholderProperty);
+            get => (string)GetValue(PlaceholderProperty);
             set
             {
                 if (string.IsNullOrWhiteSpace(value))
                 {
-                    throw new ArgumentNullException($"{nameof(this.Placeholder)} must not be null, empty, or a white space.");
+                    throw new ArgumentNullException($"{nameof(Placeholder)} must not be null, empty, or a white space.");
                 }
 
-                this.SetValue(PlaceholderProperty, value);
+                SetValue(PlaceholderProperty, value);
             }
         }
 
@@ -416,8 +418,8 @@ public string Placeholder
         /// </summary>
         public Color PlaceholderColor
         {
-            get => (Color)this.GetValue(PlaceholderColorProperty);
-            set => this.SetValue(PlaceholderColorProperty, value);
+            get => (Color)GetValue(PlaceholderColorProperty);
+            set => SetValue(PlaceholderColorProperty, value);
         }
 
         /// <summary>
@@ -425,8 +427,8 @@ public Color PlaceholderColor
         /// </summary>
         public string PlaceholderFontFamily
         {
-            get => (string)this.GetValue(PlaceholderFontFamilyProperty);
-            set => this.SetValue(PlaceholderFontFamilyProperty, value);
+            get => (string)GetValue(PlaceholderFontFamilyProperty);
+            set => SetValue(PlaceholderFontFamilyProperty, value);
         }
 
         /// <summary>
@@ -434,8 +436,8 @@ public string PlaceholderFontFamily
         /// </summary>
         public ICommand ReturnCommand
         {
-            get => (ICommand)this.GetValue(ReturnCommandProperty);
-            set => this.SetValue(ReturnCommandProperty, value);
+            get => (ICommand)GetValue(ReturnCommandProperty);
+            set => SetValue(ReturnCommandProperty, value);
         }
 
         /// <summary>
@@ -443,8 +445,8 @@ public ICommand ReturnCommand
         /// </summary>
         public object ReturnCommandParameter
         {
-            get => this.GetValue(ReturnCommandParameterProperty);
-            set => this.SetValue(ReturnCommandParameterProperty, value);
+            get => GetValue(ReturnCommandParameterProperty);
+            set => SetValue(ReturnCommandParameterProperty, value);
         }
 
         /// <summary>
@@ -452,8 +454,8 @@ public object ReturnCommandParameter
         /// </summary>
         public ReturnType ReturnType
         {
-            get => (ReturnType)this.GetValue(ReturnTypeProperty);
-            set => this.SetValue(ReturnTypeProperty, value);
+            get => (ReturnType)GetValue(ReturnTypeProperty);
+            set => SetValue(ReturnTypeProperty, value);
         }
 
         /// <summary>
@@ -461,8 +463,8 @@ public ReturnType ReturnType
         /// </summary>
         public bool ShouldAnimateUnderline
         {
-            get => (bool)this.GetValue(ShouldAnimateUnderlineProperty);
-            set => this.SetValue(ShouldAnimateUnderlineProperty, value);
+            get => (bool)GetValue(ShouldAnimateUnderlineProperty);
+            set => SetValue(ShouldAnimateUnderlineProperty, value);
         }
 
         public string ChoicesBindingName { get; set; }
@@ -480,19 +482,19 @@ public bool ShouldAnimateUnderline
         /// </summary>
         public string Text
         {
-            get => (string)this.GetValue(TextProperty);
+            get => (string)GetValue(TextProperty);
             set
             {
-                if (!string.IsNullOrEmpty(value) && !this.FloatingPlaceholderEnabled)
+                if (!string.IsNullOrEmpty(value) && !FloatingPlaceholderEnabled)
                 {
                     placeholder.IsVisible = false;
                 }
-                else if (string.IsNullOrEmpty(value) && !this.FloatingPlaceholderEnabled)
+                else if (string.IsNullOrEmpty(value) && !FloatingPlaceholderEnabled)
                 {
                     placeholder.IsVisible = true;
                 }
 
-                this.SetValue(TextProperty, value);
+                SetValue(TextProperty, value);
             }
         }
 
@@ -501,8 +503,8 @@ public string Text
         /// </summary>
         public Command<string> TextChangeCommand
         {
-            get => (Command<string>)this.GetValue(TextChangeCommandProperty);
-            set => this.SetValue(TextChangeCommandProperty, value);
+            get => (Command<string>)GetValue(TextChangeCommandProperty);
+            set => SetValue(TextChangeCommandProperty, value);
         }
 
         /// <summary>
@@ -510,8 +512,8 @@ public Command<string> TextChangeCommand
         /// </summary>
         public Color TextColor
         {
-            get => (Color)this.GetValue(TextColorProperty);
-            set => this.SetValue(TextColorProperty, value);
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
         }
 
         /// <summary>
@@ -519,8 +521,8 @@ public Color TextColor
         /// </summary>
         public string TextFontFamily
         {
-            get => (string)this.GetValue(TextFontFamilyProperty);
-            set => this.SetValue(TextFontFamilyProperty, value);
+            get => (string)GetValue(TextFontFamilyProperty);
+            set => SetValue(TextFontFamilyProperty, value);
         }
 
         /// <summary>
@@ -528,8 +530,8 @@ public string TextFontFamily
         /// </summary>
         public double TextFontSize
         {
-            get => (double)this.GetValue(TextFontSizeProperty);
-            set => this.SetValue(TextFontSizeProperty, value);
+            get => (double)GetValue(TextFontSizeProperty);
+            set => SetValue(TextFontSizeProperty, value);
         }
 
         /// <summary>
@@ -538,8 +540,8 @@ public double TextFontSize
         /// </summary>
         public Color TintColor
         {
-            get => (Color)this.GetValue(TintColorProperty);
-            set => this.SetValue(TintColorProperty, value);
+            get => (Color)GetValue(TintColorProperty);
+            set => SetValue(TintColorProperty, value);
         }
 
         /// <summary>
@@ -547,8 +549,8 @@ public Color TintColor
         /// </summary>
         public Color UnderlineColor
         {
-            get => (Color)this.GetValue(UnderlineColorProperty);
-            set => this.SetValue(UnderlineColorProperty, value);
+            get => (Color)GetValue(UnderlineColorProperty);
+            set => SetValue(UnderlineColorProperty, value);
         }
 
         /// <inheritdoc />
@@ -560,23 +562,23 @@ public void ElementChanged(bool created)
         {
             if (created)
             {
-                entry.PropertyChanged += this.Entry_PropertyChanged;
-                entry.TextChanged += this.Entry_TextChanged;
-                entry.SizeChanged += this.Entry_SizeChanged;
-                entry.Focused += this.Entry_Focused;
-                entry.Unfocused += this.Entry_Unfocused;
-                entry.Completed += this.Entry_Completed;
-                DeviceDisplay.MainDisplayInfoChanged += this.DeviceDisplay_MainDisplayInfoChanged;
+                entry.PropertyChanged += Entry_PropertyChanged;
+                entry.TextChanged += Entry_TextChanged;
+                entry.SizeChanged += Entry_SizeChanged;
+                entry.Focused += Entry_Focused;
+                entry.Unfocused += Entry_Unfocused;
+                entry.Completed += Entry_Completed;
+                DeviceDisplay.MainDisplayInfoChanged += DeviceDisplay_MainDisplayInfoChanged;
             }
             else
             {
-                entry.PropertyChanged -= this.Entry_PropertyChanged;
-                entry.TextChanged -= this.Entry_TextChanged;
-                entry.SizeChanged -= this.Entry_SizeChanged;
-                entry.Focused -= this.Entry_Focused;
-                entry.Unfocused -= this.Entry_Unfocused;
-                entry.Completed += this.Entry_Completed;
-                DeviceDisplay.MainDisplayInfoChanged -= this.DeviceDisplay_MainDisplayInfoChanged;
+                entry.PropertyChanged -= Entry_PropertyChanged;
+                entry.TextChanged -= Entry_TextChanged;
+                entry.SizeChanged -= Entry_SizeChanged;
+                entry.Focused -= Entry_Focused;
+                entry.Unfocused -= Entry_Unfocused;
+                entry.Completed += Entry_Completed;
+                DeviceDisplay.MainDisplayInfoChanged -= DeviceDisplay_MainDisplayInfoChanged;
             }
         }
 
@@ -594,14 +596,14 @@ protected override void OnBindingContextChanged()
         {
             base.OnBindingContextChanged();
 
-            this.AnimateToInactiveOrFocusedStateOnStart(this.BindingContext);
+            AnimateToInactiveOrFocusedStateOnStart(BindingContext);
         }
 
         protected override void OnParentSet()
         {
             base.OnParentSet();
 
-            this.AnimateToInactiveOrFocusedStateOnStart(this.Parent);
+            AnimateToInactiveOrFocusedStateOnStart(Parent);
         }
 
         /// <inheritdoc />
@@ -613,7 +615,10 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         {
             base.OnPropertyChanged(propertyName);
 
-            if (propertyName == null) return;
+            if (propertyName == null)
+            {
+                return;
+            }
 
             if (_propertyChangeActions != null && _propertyChangeActions.TryGetValue(propertyName, out var handlePropertyChange))
             {
@@ -624,13 +629,13 @@ protected override void OnPropertyChanged([CallerMemberName] string propertyName
         private void AnimateToActivatedState()
         {
             var anim = new Animation();
-            var hasText = !string.IsNullOrEmpty(this.Text);
+            var hasText = !string.IsNullOrEmpty(Text);
 
             if (entry.IsFocused)
             {
-                var tintColor = this.HasError ? this.ErrorColor : this.TintColor;
+                var tintColor = HasError ? ErrorColor : TintColor;
 
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
                     anim.Add(0.0, AnimationDuration, new Animation(v => underline.HeightRequest = v, 1, 2, _animationCurve, () =>
                     {
@@ -642,12 +647,12 @@ private void AnimateToActivatedState()
             }
             else
             {
-                var underlineColor = this.HasError ? this.ErrorColor : this.UnderlineColor;
-                var placeholderColor = this.HasError ? this.ErrorColor : this.FloatingPlaceholderColor;
+                var underlineColor = HasError ? ErrorColor : UnderlineColor;
+                var placeholderColor = HasError ? ErrorColor : FloatingPlaceholderColor;
 
                 var endHeight = hasText ? 1 : 0;
 
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
                     anim.Add(0.0, AnimationDuration, new Animation(v => underline.HeightRequest = v, underline.HeightRequest, endHeight, _animationCurve, () =>
                     {
@@ -664,23 +669,23 @@ private void AnimateToActivatedState()
         private void AnimateToInactiveOrFocusedState()
         {
             Color tintColor;
-            double preferredStartFont = this.FloatingPlaceholderFontSize == 0 ? entry.FontSize * 0.75 : this.FloatingPlaceholderFontSize;
-            double preferredEndFont = this.FloatingPlaceholderFontSize == 0 ? entry.FontSize * 0.75 : this.FloatingPlaceholderFontSize;
-            double startFont = entry.IsFocused ? entry.FontSize : preferredStartFont;
-            double endFOnt = entry.IsFocused ? preferredEndFont : entry.FontSize;
+            var preferredStartFont = FloatingPlaceholderFontSize == 0 ? entry.FontSize * 0.75 : FloatingPlaceholderFontSize;
+            var preferredEndFont = FloatingPlaceholderFontSize == 0 ? entry.FontSize * 0.75 : FloatingPlaceholderFontSize;
+            var startFont = entry.IsFocused ? entry.FontSize : preferredStartFont;
+            var endFOnt = entry.IsFocused ? preferredEndFont : entry.FontSize;
             var startY = placeholder.TranslationY;
-            double endY = entry.IsFocused ? -(entry.FontSize * 0.8) : 0;
+            var endY = entry.IsFocused ? -(entry.FontSize * 0.8) : 0;
 
-            if (this.HasError)
+            if (HasError)
             {
-                tintColor = entry.IsFocused ? this.ErrorColor : this.PlaceholderColor;
+                tintColor = entry.IsFocused ? ErrorColor : PlaceholderColor;
             }
             else
             {
-                tintColor = entry.IsFocused ? this.TintColor : this.PlaceholderColor;
+                tintColor = entry.IsFocused ? TintColor : PlaceholderColor;
             }
 
-            var anim = this.FloatingPlaceholderEnabled ? new Animation
+            var anim = FloatingPlaceholderEnabled ? new Animation
             {
                 {
                     0.0,
@@ -692,9 +697,9 @@ private void AnimateToInactiveOrFocusedState()
                     AnimationDuration,
                     new Animation(v => placeholder.TranslationY = v, startY, endY, _animationCurve, () =>
                     {
-                        if(this.HasError && entry.IsFocused)
+                        if(HasError && entry.IsFocused)
                         {
-                            placeholder.TextColor = this.ErrorColor;
+                            placeholder.TextColor = ErrorColor;
                         }
 
                         placeholder.TextColor = tintColor;
@@ -704,11 +709,11 @@ private void AnimateToInactiveOrFocusedState()
 
             if (entry.IsFocused)
             {
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
-                    underline.Color = this.HasError ? this.ErrorColor : this.TintColor;
+                    underline.Color = HasError ? ErrorColor : TintColor;
 
-                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, this.Width, _animationCurve, () =>
+                    anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, Width, _animationCurve, () =>
                     {
                         underline.WidthRequest = -1;
                         underline.HorizontalOptions = LayoutOptions.FillAndExpand;
@@ -717,7 +722,7 @@ private void AnimateToInactiveOrFocusedState()
             }
             else
             {
-                if (this.ShouldAnimateUnderline)
+                if (ShouldAnimateUnderline)
                 {
                     anim.Add(0.0, AnimationDuration, new Animation(v => underline.HeightRequest = v, underline.HeightRequest, 0, _animationCurve, () =>
                     {
@@ -736,12 +741,12 @@ private void AnimateToInactiveOrFocusedStateOnStart(object startObject)
             var placeholderEndY = -(entry.FontSize * 0.8);
             var placeholderEndFont = entry.FontSize * 0.75;
 
-            if (!this.FloatingPlaceholderEnabled && string.IsNullOrEmpty(entry.Text))
+            if (!FloatingPlaceholderEnabled && string.IsNullOrEmpty(entry.Text))
             {
-                placeholder.TextColor = this.PlaceholderColor;
+                placeholder.TextColor = PlaceholderColor;
             }
 
-            if (startObject != null && !string.IsNullOrEmpty(this.Text) && !_wasFocused)
+            if (startObject != null && !string.IsNullOrEmpty(Text) && !_wasFocused)
             {
                 if (placeholder.TranslationY == placeholderEndY)
                 {
@@ -753,21 +758,21 @@ private void AnimateToInactiveOrFocusedStateOnStart(object startObject)
                 {
                     var anim = new Animation();
 
-                    if (this.FloatingPlaceholderEnabled)
+                    if (FloatingPlaceholderEnabled)
                     {
                         anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.FontSize = v, entry.FontSize, placeholderEndFont, _animationCurve));
                         anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.TranslationY = v, placeholder.TranslationY, placeholderEndY, _animationCurve, () =>
                         {
-                            placeholder.TextColor = this.HasError ? this.ErrorColor : this.FloatingPlaceholderColor;
+                            placeholder.TextColor = HasError ? ErrorColor : FloatingPlaceholderColor;
                             entry.Opacity = 1;
                         }));
                     }
 
-                    if (this.ShouldAnimateUnderline)
+                    if (ShouldAnimateUnderline)
                     {
-                        underline.Color = this.HasError ? this.ErrorColor : this.TintColor;
+                        underline.Color = HasError ? ErrorColor : TintColor;
                         underline.HeightRequest = 1;
-                        anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, this.Width, _animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
+                        anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, 0, Width, _animationCurve, () => underline.HorizontalOptions = LayoutOptions.FillAndExpand));
                     }
 
                     anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: _animationCurve);
@@ -778,7 +783,7 @@ private void AnimateToInactiveOrFocusedStateOnStart(object startObject)
                 return;
             }
 
-            if (startObject != null && string.IsNullOrEmpty(this.Text) && placeholder.TranslationY == placeholderEndY)
+            if (startObject != null && string.IsNullOrEmpty(Text) && placeholder.TranslationY == placeholderEndY)
             {
                 if (entry.IsFocused)
                 {
@@ -789,19 +794,19 @@ private void AnimateToInactiveOrFocusedStateOnStart(object startObject)
                 {
                     var anim = new Animation();
 
-                    if (this.FloatingPlaceholderEnabled)
+                    if (FloatingPlaceholderEnabled)
                     {
                         anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.FontSize = v, placeholderEndFont, entry.FontSize, _animationCurve));
                         anim.Add(0.0, AnimationDuration, new Animation(v => placeholder.TranslationY = v, placeholder.TranslationY, 0, _animationCurve, () =>
                         {
-                            placeholder.TextColor = this.PlaceholderColor;
+                            placeholder.TextColor = PlaceholderColor;
                             entry.Opacity = 1;
                         }));
                     }
 
-                    if (this.ShouldAnimateUnderline)
+                    if (ShouldAnimateUnderline)
                     {
-                        anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, this.Width, 0, _animationCurve, () => underline.HorizontalOptions = LayoutOptions.Center));
+                        anim.Add(0.0, AnimationDuration, new Animation(v => underline.WidthRequest = v, Width, 0, _animationCurve, () => underline.HorizontalOptions = LayoutOptions.Center));
                     }
 
                     anim.Commit(this, "Anim2", rate: 2, length: (uint)(AnimationDuration * 1000), easing: _animationCurve);
@@ -812,17 +817,17 @@ private void AnimateToInactiveOrFocusedStateOnStart(object startObject)
         private void ChangeToErrorState()
         {
             const int animDuration = 250;
-            placeholder.TextColor = (this.FloatingPlaceholderEnabled && entry.IsFocused) || (this.FloatingPlaceholderEnabled && !string.IsNullOrEmpty(this.Text)) ? this.ErrorColor : this.PlaceholderColor;
-            counter.TextColor = this.ErrorColor;
-            underline.Color = this.ShouldAnimateUnderline ? this.ErrorColor : Color.Transparent;
-            persistentUnderline.Color = this.AlwaysShowUnderline ? this.ErrorColor : Color.Transparent;
+            placeholder.TextColor = (FloatingPlaceholderEnabled && entry.IsFocused) || (FloatingPlaceholderEnabled && !string.IsNullOrEmpty(Text)) ? ErrorColor : PlaceholderColor;
+            counter.TextColor = ErrorColor;
+            underline.Color = ShouldAnimateUnderline ? ErrorColor : Color.Transparent;
+            persistentUnderline.Color = AlwaysShowUnderline ? ErrorColor : Color.Transparent;
             trailingIcon.IsVisible = true;
             trailingIcon.Source = "xf_error";
-            trailingIcon.TintColor = this.ErrorColor;
+            trailingIcon.TintColor = ErrorColor;
 
-            if (string.IsNullOrEmpty(this.ErrorText))
+            if (string.IsNullOrEmpty(ErrorText))
             {
-                helper.TextColor = this.ErrorColor;
+                helper.TextColor = ErrorColor;
             }
             else
             {
@@ -830,8 +835,8 @@ private void ChangeToErrorState()
                 {
                     await helper.FadeTo(0, animDuration / 2, _animationCurve);
                     helper.TranslationY = -4;
-                    helper.TextColor = this.ErrorColor;
-                    helper.Text = this.ErrorText;
+                    helper.TextColor = ErrorColor;
+                    helper.Text = ErrorText;
                     await Task.WhenAll(helper.FadeTo(1, animDuration / 2, _animationCurve), helper.TranslateTo(0, 0, animDuration / 2, _animationCurve));
                 });
             }
@@ -840,7 +845,7 @@ private void ChangeToErrorState()
         private void ChangeToNormalState()
         {
             const double opactiy = 1;
-            this.IsEnabled = true;
+            IsEnabled = true;
             entry.Opacity = opactiy;
             placeholder.Opacity = opactiy;
             helper.Opacity = opactiy;
@@ -848,32 +853,32 @@ private void ChangeToNormalState()
 
             Device.BeginInvokeOnMainThread(async () =>
             {
-                if (this.InputType == MaterialTextFieldInputType.Choice)
+                if (InputType == MaterialTextFieldInputType.Choice)
                 {
                     trailingIcon.Source = "xf_arrow_dropdown";
-                    trailingIcon.TintColor = this.TextColor;
+                    trailingIcon.TintColor = TextColor;
                 }
                 else
                 {
                     trailingIcon.IsVisible = false;
                 }
 
-                var accentColor = this.TintColor;
+                var accentColor = TintColor;
                 placeholder.TextColor = accentColor;
-                counter.TextColor = this.HelperTextColor;
+                counter.TextColor = HelperTextColor;
                 underline.Color = accentColor;
-                persistentUnderline.Color = this.UnderlineColor;
+                persistentUnderline.Color = UnderlineColor;
 
-                if (string.IsNullOrEmpty(this.ErrorText))
+                if (string.IsNullOrEmpty(ErrorText))
                 {
-                    helper.TextColor = this.HelperTextColor;
+                    helper.TextColor = HelperTextColor;
                 }
                 else
                 {
                     await helper.FadeTo(0, 150, _animationCurve);
                     helper.TranslationY = -4;
-                    helper.TextColor = this.HelperTextColor;
-                    helper.Text = this.HelperText;
+                    helper.TextColor = HelperTextColor;
+                    helper.Text = HelperText;
                     await Task.WhenAll(helper.FadeTo(1, 150, _animationCurve), helper.TranslateTo(0, 0, 150, _animationCurve));
                 }
             });
@@ -883,7 +888,7 @@ private void DeviceDisplay_MainDisplayInfoChanged(object sender, DisplayInfoChan
         {
             if (e.DisplayInfo.Orientation != _lastDeviceDisplay.Orientation)
             {
-                if (!string.IsNullOrEmpty(entry.Text) && this.ShouldAnimateUnderline)
+                if (!string.IsNullOrEmpty(entry.Text) && ShouldAnimateUnderline)
                 {
                     underline.WidthRequest = -1;
                     underline.HorizontalOptions = LayoutOptions.FillAndExpand;
@@ -893,99 +898,99 @@ private void DeviceDisplay_MainDisplayInfoChanged(object sender, DisplayInfoChan
             }
         }
 
-        private void Entry_Completed(object sender, EventArgs e) => this.Completed?.Invoke(this, EventArgs.Empty);
+        private void Entry_Completed(object sender, EventArgs e) => Completed?.Invoke(this, EventArgs.Empty);
 
         private void Entry_Focused(object sender, FocusEventArgs e)
         {
             _wasFocused = true;
-            this.FocusCommand?.Execute(entry.IsFocused);
-            this.Focused?.Invoke(this, e);
-            this.UpdateCounter();
+            FocusCommand?.Execute(entry.IsFocused);
+            Focused?.Invoke(this, e);
+            UpdateCounter();
         }
 
         private void Entry_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             switch (e.PropertyName)
             {
-                case nameof(this.IsFocused) when string.IsNullOrEmpty(entry.Text):
-                    this.AnimateToInactiveOrFocusedState();
+                case nameof(IsFocused) when string.IsNullOrEmpty(entry.Text):
+                    AnimateToInactiveOrFocusedState();
                     break;
 
-                case nameof(this.IsFocused) when !string.IsNullOrEmpty(entry.Text):
-                    this.AnimateToActivatedState();
+                case nameof(IsFocused) when !string.IsNullOrEmpty(entry.Text):
+                    AnimateToActivatedState();
                     break;
 
                 case nameof(Entry.Text):
-                    this.Text = entry.Text;
-                    this.UpdateCounter();
+                    Text = entry.Text;
+                    UpdateCounter();
                     break;
             }
         }
 
         private void Entry_SizeChanged(object sender, EventArgs e)
         {
-            var baseHeight = this.FloatingPlaceholderEnabled ? 56 : 40;
+            var baseHeight = FloatingPlaceholderEnabled ? 56 : 40;
             var diff = entry.Height - 20;
             var rawRowHeight = baseHeight + diff;
             _autoSizingRow.Height = new GridLength(rawRowHeight);
 
-            double iconVerticalMargin = (_autoSizingRow.Height.Value - 24) / 2;
+            var iconVerticalMargin = (_autoSizingRow.Height.Value - 24) / 2;
 
             if (leadingIcon.IsVisible)
             {
-                leadingIcon.Margin = new Thickness(this.HorizontalPadding.Left, iconVerticalMargin, 0, iconVerticalMargin);
-                entry.Margin = new Thickness(12, entry.Margin.Top, this.HorizontalPadding.Right, entry.Margin.Bottom);
+                leadingIcon.Margin = new Thickness(HorizontalPadding.Left, iconVerticalMargin, 0, iconVerticalMargin);
+                entry.Margin = new Thickness(12, entry.Margin.Top, HorizontalPadding.Right, entry.Margin.Bottom);
             }
             else
             {
-                entry.Margin = new Thickness(this.HorizontalPadding.Left, entry.Margin.Top, this.HorizontalPadding.Right, entry.Margin.Bottom);
+                entry.Margin = new Thickness(HorizontalPadding.Left, entry.Margin.Top, HorizontalPadding.Right, entry.Margin.Bottom);
             }
 
             if (trailingIcon.IsVisible)
             {
-                var entryPaddingLeft = leadingIcon.IsVisible ? 12 : this.HorizontalPadding;
-                trailingIcon.Margin = new Thickness(12, iconVerticalMargin, this.HorizontalPadding.Right, iconVerticalMargin);
+                var entryPaddingLeft = leadingIcon.IsVisible ? 12 : HorizontalPadding;
+                trailingIcon.Margin = new Thickness(12, iconVerticalMargin, HorizontalPadding.Right, iconVerticalMargin);
                 entry.Margin = new Thickness(entryPaddingLeft.Left, entry.Margin.Top, 0, entry.Margin.Bottom);
             }
 
-            helper.Margin = new Thickness(this.HorizontalPadding.Left, helper.Margin.Top, 12, 0);
-            counter.Margin = new Thickness(0, counter.Margin.Top, this.HorizontalPadding.Right, 0);
+            helper.Margin = new Thickness(HorizontalPadding.Left, helper.Margin.Top, 12, 0);
+            counter.Margin = new Thickness(0, counter.Margin.Top, HorizontalPadding.Right, 0);
 
-            var placeholderLeftMargin = this.FloatingPlaceholderEnabled ? this.HorizontalPadding.Left : entry.Margin.Left;
+            var placeholderLeftMargin = FloatingPlaceholderEnabled ? HorizontalPadding.Left : entry.Margin.Left;
             placeholder.Margin = new Thickness(placeholderLeftMargin, 0, 0, 0);
 
-            if (this.HasError)
+            if (HasError)
             {
-                underline.Color = this.ErrorColor;
+                underline.Color = ErrorColor;
             }
         }
 
         private void Entry_TextChanged(object sender, TextChangedEventArgs e)
         {
-            this.TextChangeCommand?.Execute(entry.Text);
-            this.TextChanged?.Invoke(this, e);
+            TextChangeCommand?.Execute(entry.Text);
+            TextChanged?.Invoke(this, e);
         }
 
         private void Entry_Unfocused(object sender, FocusEventArgs e)
         {
-            this.FocusCommand?.Execute(entry.IsFocused);
-            this.Unfocused?.Invoke(this, e);
-            this.UpdateCounter();
+            FocusCommand?.Execute(entry.IsFocused);
+            Unfocused?.Invoke(this, e);
+            UpdateCounter();
         }
 
         private IList<string> GetChoices()
         {
-            var choiceStrings = new List<string>(this.Choices.Count);
-            var listType = this.Choices[0].GetType();
-            foreach (var item in this.Choices)
+            var choiceStrings = new List<string>(Choices.Count);
+            var listType = Choices[0].GetType();
+            foreach (var item in Choices)
             {
-                if (!string.IsNullOrEmpty(this.ChoicesBindingName))
+                if (!string.IsNullOrEmpty(ChoicesBindingName))
                 {
-                    var propInfo = listType.GetProperty(this.ChoicesBindingName);
+                    var propInfo = listType.GetProperty(ChoicesBindingName);
 
                     if (propInfo == null)
                     {
-                        System.Diagnostics.Debug.WriteLine($"Property {this.ChoicesBindingName} was not found for item in {this.Choices}.");
+                        System.Diagnostics.Debug.WriteLine($"Property {ChoicesBindingName} was not found for item in {Choices}.");
                         choiceStrings.Add(item.ToString());
                     }
                     else
@@ -1010,13 +1015,13 @@ private object GetSelectedChoice(int index)
                 return null;
             }
 
-            return this.Choices[index];
+            return Choices[index];
         }
 
         private void OnAlwaysShowUnderlineChanged(bool isShown)
         {
             persistentUnderline.IsVisible = isShown;
-            persistentUnderline.Color = this.UnderlineColor;
+            persistentUnderline.Color = UnderlineColor;
         }
 
         private void OnBackgroundColorChanged(Color backgroundColor)
@@ -1026,13 +1031,13 @@ private void OnBackgroundColorChanged(Color backgroundColor)
 
         private void OnChoicesChanged(ICollection choices)
         {
-            _choices = choices?.Count > 0 ? this.GetChoices() : null;
+            _choices = choices?.Count > 0 ? GetChoices() : null;
         }
 
         private void OnEnabledChanged(bool isEnabled)
         {
-            this.Opacity = isEnabled ? 1 : 0.33;
-            helper.IsVisible = isEnabled && !string.IsNullOrEmpty(this.HelperText);
+            Opacity = isEnabled ? 1 : 0.33;
+            helper.IsVisible = isEnabled && !string.IsNullOrEmpty(HelperText);
         }
 
         private void OnErrorColorChanged(Color errorColor)
@@ -1042,9 +1047,9 @@ private void OnErrorColorChanged(Color errorColor)
 
         private void OnErrorTextChanged()
         {
-            if (this.HasError)
+            if (HasError)
             {
-                this.ChangeToErrorState();
+                ChangeToErrorState();
             }
         }
 
@@ -1062,13 +1067,13 @@ private void OnFloatingPlaceholderEnabledChanged(bool isEnabled)
 
         private void OnHasErrorChanged()
         {
-            if (this.HasError)
+            if (HasError)
             {
-                this.ChangeToErrorState();
+                ChangeToErrorState();
             }
             else
             {
-                this.ChangeToNormalState();
+                ChangeToNormalState();
             }
         }
 
@@ -1171,7 +1176,7 @@ private void OnKeyboardFlagsChanged(bool isAutoCapitalizationEnabled, bool isSpe
         private void OnLeadingIconChanged(string icon)
         {
             leadingIcon.Source = icon;
-            this.OnLeadingIconTintColorChanged(this.LeadingIconTintColor);
+            OnLeadingIconTintColorChanged(LeadingIconTintColor);
         }
 
         private void OnLeadingIconTintColorChanged(Color tintColor)
@@ -1217,11 +1222,11 @@ private void OnReturnTypeChangedd(ReturnType returnType)
 
         private async Task OnSelectChoices()
         {
-            if (this.Choices == null || this.Choices?.Count <= 0)
+            if (Choices == null || Choices?.Count <= 0)
             {
                 throw new InvalidOperationException("The property `Choices` is null or empty");
             }
-            _choices = this.GetChoices();
+            _choices = GetChoices();
 
             var title = MaterialConfirmationDialog.GetDialogTitle(this);
             var confirmingText = MaterialConfirmationDialog.GetDialogConfirmingText(this);
@@ -1241,28 +1246,28 @@ private async Task OnSelectChoices()
             if (result >= 0)
             {
                 _selectedIndex = result;
-                this.Text = _choices[result];
+                Text = _choices[result];
                 // entry.Text = Text;
             }
         }
 
         private void OnTextChanged(string text)
         {
-            if (this.InputType == MaterialTextFieldInputType.Choice && !string.IsNullOrEmpty(text) && _choices?.Contains(text) == false)
+            if (InputType == MaterialTextFieldInputType.Choice && !string.IsNullOrEmpty(text) && _choices?.Contains(text) == false)
             {
-                Debug.WriteLine($"The `Text` property value `{this.Text}` does not match any item in the collection `Choices`.");
-                this.Text = null;
+                Debug.WriteLine($"The `Text` property value `{Text}` does not match any item in the collection `Choices`.");
+                Text = null;
                 return;
             }
 
-            if (this.InputType == MaterialTextFieldInputType.Choice && !string.IsNullOrEmpty(text))
+            if (InputType == MaterialTextFieldInputType.Choice && !string.IsNullOrEmpty(text))
             {
-                var selectedChoice = this.GetSelectedChoice(_selectedIndex);
+                var selectedChoice = GetSelectedChoice(_selectedIndex);
                 SelectedChoice = selectedChoice;
-                this.ChoiceSelected?.Invoke(this, new SelectedItemChangedEventArgs(selectedChoice));
-                this.ChoiceSelectedCommand?.Execute(selectedChoice);
+                ChoiceSelected?.Invoke(this, new SelectedItemChangedEventArgs(selectedChoice));
+                ChoiceSelectedCommand?.Execute(selectedChoice);
             }
-            else if (this.InputType == MaterialTextFieldInputType.Choice && string.IsNullOrEmpty(text))
+            else if (InputType == MaterialTextFieldInputType.Choice && string.IsNullOrEmpty(text))
             {
                 _selectedIndex = -1;
 
@@ -1271,8 +1276,8 @@ private void OnTextChanged(string text)
             entry.Text = text;
 
 
-            this.AnimateToInactiveOrFocusedStateOnStart(this);
-            this.UpdateCounter();
+            AnimateToInactiveOrFocusedStateOnStart(this);
+            UpdateCounter();
         }
 
         private void OnTextColorChanged(Color textColor)
@@ -1297,7 +1302,7 @@ private void OnTintColorChanged(Color tintColor)
 
         private void OnUnderlineColorChanged(Color underlineColor)
         {
-            if (this.AlwaysShowUnderline)
+            if (AlwaysShowUnderline)
             {
                 persistentUnderline.Color = underlineColor;
             }
@@ -1305,8 +1310,8 @@ private void OnUnderlineColorChanged(Color underlineColor)
 
         private void SetControl()
         {
-            trailingIcon.TintColor = this.TextColor;
-            persistentUnderline.Color = this.UnderlineColor;
+            trailingIcon.TintColor = TextColor;
+            persistentUnderline.Color = UnderlineColor;
             tapGesture.Command = new Command(() =>
             {
                 if (!entry.IsFocused)
@@ -1315,51 +1320,55 @@ private void SetControl()
                 }
             });
 
-            mainTapGesture.Command = new Command(async () => await this.OnSelectChoices());
+            mainTapGesture.Command = new Command(async () => await OnSelectChoices());
         }
 
         private void SetPropertyChangeHandler(ref Dictionary<string, Action> propertyChangeActions)
         {
             propertyChangeActions = new Dictionary<string, Action>
             {
-                { nameof(this.Text), () => this.OnTextChanged(this.Text) },
-                { nameof(this.TextColor), () => this.OnTextColorChanged(this.TextColor) },
-                { nameof(this.TextFontFamily), () => this.OnTextFontFamilyChanged(this.TextFontFamily) },
-                { nameof(this.TintColor), () => this.OnTintColorChanged(this.TintColor) },
-                { nameof(this.Placeholder), () => this.OnPlaceholderChanged(this.Placeholder) },
-                { nameof(this.PlaceholderColor), () => this.OnPlaceholderColorChanged(this.PlaceholderColor) },
-                { nameof(this.PlaceholderFontFamily), () => this.OnPlaceholderFontFamilyChanged(this.PlaceholderFontFamily) },
-                { nameof(this.HelperText), () => this.OnHelperTextChanged(this.HelperText) },
-                { nameof(this.HelperTextFontFamily), () => this.OnHelpertTextFontFamilyChanged(this.HelperTextFontFamily) },
-                { nameof(this.HelperTextColor), () => this.OnHelperTextColorChanged(this.HelperTextColor) },
-                { nameof(this.InputType), () => this.OnInputTypeChanged(this.InputType) },
-                { nameof(this.IsEnabled), () => this.OnEnabledChanged(this.IsEnabled) },
-                { nameof(this.BackgroundColor), () => this.OnBackgroundColorChanged(this.BackgroundColor) },
-                { nameof(this.AlwaysShowUnderline), () => this.OnAlwaysShowUnderlineChanged(this.AlwaysShowUnderline) },
-                { nameof(this.MaxLength), () => this.OnMaxLengthChanged(this.MaxLength, this.IsMaxLengthCounterVisible) },
-                { nameof(this.ReturnCommand), () => this.OnReturnCommandChanged(this.ReturnCommand) },
-                { nameof(this.ReturnCommandParameter), () => this.OnReturnCommandParameterChanged(this.ReturnCommandParameter) },
-                { nameof(this.ReturnType), () => this.OnReturnTypeChangedd(this.ReturnType) },
-                { nameof(this.ErrorColor), () => this.OnErrorColorChanged(this.ErrorColor) },
-                { nameof(this.UnderlineColor), () => this.OnUnderlineColorChanged(this.UnderlineColor) },
-                { nameof(this.HasError), () => this.OnHasErrorChanged() },
-                { nameof(this.FloatingPlaceholderEnabled), () => this.OnFloatingPlaceholderEnabledChanged(this.FloatingPlaceholderEnabled) },
-                { nameof(this.Choices), () => this.OnChoicesChanged(this.Choices) },
-                { nameof(this.LeadingIcon), () => this.OnLeadingIconChanged(this.LeadingIcon) },
-                { nameof(this.LeadingIconTintColor), () => this.OnLeadingIconTintColorChanged(this.LeadingIconTintColor) },
-                { nameof(this.IsSpellCheckEnabled), () => this.OnKeyboardFlagsChanged(this.IsAutoCapitalizationEnabled, this.IsSpellCheckEnabled, this.IsTextPredictionEnabled) },
-                { nameof(this.IsTextPredictionEnabled), () => this.OnKeyboardFlagsChanged(this.IsAutoCapitalizationEnabled, this.IsSpellCheckEnabled, this.IsTextPredictionEnabled) },
-                { nameof(this.IsAutoCapitalizationEnabled), () => this.OnKeyboardFlagsChanged(this.IsAutoCapitalizationEnabled, this.IsSpellCheckEnabled, this.IsTextPredictionEnabled) },
-                { nameof(this.TextFontSize), () => this.OnTextFontSizeChanged(this.TextFontSize) },
-                { nameof(this.ErrorText), () => this.OnErrorTextChanged() }
+                { nameof(Text), () => OnTextChanged(Text) },
+                { nameof(TextColor), () => OnTextColorChanged(TextColor) },
+                { nameof(TextFontFamily), () => OnTextFontFamilyChanged(TextFontFamily) },
+                { nameof(TintColor), () => OnTintColorChanged(TintColor) },
+                { nameof(Placeholder), () => OnPlaceholderChanged(Placeholder) },
+                { nameof(PlaceholderColor), () => OnPlaceholderColorChanged(PlaceholderColor) },
+                { nameof(PlaceholderFontFamily), () => OnPlaceholderFontFamilyChanged(PlaceholderFontFamily) },
+                { nameof(HelperText), () => OnHelperTextChanged(HelperText) },
+                { nameof(HelperTextFontFamily), () => OnHelpertTextFontFamilyChanged(HelperTextFontFamily) },
+                { nameof(HelperTextColor), () => OnHelperTextColorChanged(HelperTextColor) },
+                { nameof(InputType), () => OnInputTypeChanged(InputType) },
+                { nameof(IsEnabled), () => OnEnabledChanged(IsEnabled) },
+                { nameof(BackgroundColor), () => OnBackgroundColorChanged(BackgroundColor) },
+                { nameof(AlwaysShowUnderline), () => OnAlwaysShowUnderlineChanged(AlwaysShowUnderline) },
+                { nameof(MaxLength), () => OnMaxLengthChanged(MaxLength, IsMaxLengthCounterVisible) },
+                { nameof(ReturnCommand), () => OnReturnCommandChanged(ReturnCommand) },
+                { nameof(ReturnCommandParameter), () => OnReturnCommandParameterChanged(ReturnCommandParameter) },
+                { nameof(ReturnType), () => OnReturnTypeChangedd(ReturnType) },
+                { nameof(ErrorColor), () => OnErrorColorChanged(ErrorColor) },
+                { nameof(UnderlineColor), () => OnUnderlineColorChanged(UnderlineColor) },
+                { nameof(HasError), () => OnHasErrorChanged() },
+                { nameof(FloatingPlaceholderEnabled), () => OnFloatingPlaceholderEnabledChanged(FloatingPlaceholderEnabled) },
+                { nameof(Choices), () => OnChoicesChanged(Choices) },
+                { nameof(LeadingIcon), () => OnLeadingIconChanged(LeadingIcon) },
+                { nameof(LeadingIconTintColor), () => OnLeadingIconTintColorChanged(LeadingIconTintColor) },
+                { nameof(IsSpellCheckEnabled), () => OnKeyboardFlagsChanged(IsAutoCapitalizationEnabled, IsSpellCheckEnabled, IsTextPredictionEnabled) },
+                { nameof(IsTextPredictionEnabled), () => OnKeyboardFlagsChanged(IsAutoCapitalizationEnabled, IsSpellCheckEnabled, IsTextPredictionEnabled) },
+                { nameof(IsAutoCapitalizationEnabled), () => OnKeyboardFlagsChanged(IsAutoCapitalizationEnabled, IsSpellCheckEnabled, IsTextPredictionEnabled) },
+                { nameof(TextFontSize), () => OnTextFontSizeChanged(TextFontSize) },
+                { nameof(ErrorText), () => OnErrorTextChanged() }
             };
         }
 
         private void UpdateCounter()
         {
-            if (!_counterEnabled) return;
+            if (!_counterEnabled)
+            {
+                return;
+            }
+
             var count = entry.Text?.Length ?? 0;
-            counter.Text = entry.IsFocused ? $"{count}/{this.MaxLength}" : string.Empty;
+            counter.Text = entry.IsFocused ? $"{count}/{MaxLength}" : string.Empty;
         }
     }
 }
diff --git a/XF.Material/UI/MenuSelectedEventArgs.cs b/XF.Material/UI/MenuSelectedEventArgs.cs
index bd912f5e..64e5520b 100644
--- a/XF.Material/UI/MenuSelectedEventArgs.cs
+++ b/XF.Material/UI/MenuSelectedEventArgs.cs
@@ -21,7 +21,7 @@ public class MenuSelectedEventArgs : EventArgs
         /// <param name="result">The result of the selection.</param>
         public MenuSelectedEventArgs(MaterialMenuResult result)
         {
-            this.Result = result;
+            Result = result;
         }
     }
 }
diff --git a/XF.Material/UI/SelectedChangedEventArgs.cs b/XF.Material/UI/SelectedChangedEventArgs.cs
index 297c1fc0..22c83039 100644
--- a/XF.Material/UI/SelectedChangedEventArgs.cs
+++ b/XF.Material/UI/SelectedChangedEventArgs.cs
@@ -8,7 +8,7 @@ public class SelectedChangedEventArgs : EventArgs
 
         public SelectedChangedEventArgs(bool isSelected)
         {
-            this.IsSelected = isSelected;
+            IsSelected = isSelected;
         }
     }
 }
diff --git a/XF.Material/UI/SelectedIndexChangedEventArgs.cs b/XF.Material/UI/SelectedIndexChangedEventArgs.cs
index 18b294b8..adc5035c 100644
--- a/XF.Material/UI/SelectedIndexChangedEventArgs.cs
+++ b/XF.Material/UI/SelectedIndexChangedEventArgs.cs
@@ -11,7 +11,7 @@ public class SelectedIndexChangedEventArgs : EventArgs
 
         public SelectedIndexChangedEventArgs(int index)
         {
-            this.Index = index;
+            Index = index;
         }
     }
 }
diff --git a/XF.Material/UI/SelectedIndicesChangedEventArgs.cs b/XF.Material/UI/SelectedIndicesChangedEventArgs.cs
index e24440c5..749961bf 100644
--- a/XF.Material/UI/SelectedIndicesChangedEventArgs.cs
+++ b/XF.Material/UI/SelectedIndicesChangedEventArgs.cs
@@ -12,7 +12,7 @@ public class SelectedIndicesChangedEventArgs : EventArgs
 
         public SelectedIndicesChangedEventArgs(IList<int> indices)
         {
-            this.Indices = indices;
+            Indices = indices;
         }
     }
 }
diff --git a/XF.Material/Utilities/PropertyChangeAware.cs b/XF.Material/Utilities/PropertyChangeAware.cs
index f296de63..7cab87ec 100644
--- a/XF.Material/Utilities/PropertyChangeAware.cs
+++ b/XF.Material/Utilities/PropertyChangeAware.cs
@@ -26,15 +26,19 @@ internal abstract class PropertyChangeAware : INotifyPropertyChanged
         {
             if (!EqualityComparer<T>.Default.Equals(field, default(T)))
             {
-                if (field.Equals(newValue)) return;
+                if (field.Equals(newValue))
+                {
+                    return;
+                }
+
                 field = newValue;
-                this.OnPropertyChanged(propertyName);
+                OnPropertyChanged(propertyName);
             }
 
             else if (!EqualityComparer<T>.Default.Equals(newValue, default(T)))
             {
                 field = newValue;
-                this.OnPropertyChanged(propertyName);
+                OnPropertyChanged(propertyName);
             }
         }
 
@@ -44,7 +48,7 @@ internal abstract class PropertyChangeAware : INotifyPropertyChanged
         /// <param name="propertyName">The name of the property who's value has changed.</param>
         protected virtual void OnPropertyChanged([CallerMemberName]string propertyName = null)
         {
-            this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }