3 files changed, 64 insertions, 31 deletions

diff --git a/Xamarin.Forms.Core/CarouselView.cs b/Xamarin.Forms.Core/CarouselView.cs
index 68c387b6..c74463d3 100644
--- a/Xamarin.Forms.Core/CarouselView.cs
+++ b/Xamarin.Forms.Core/CarouselView.cs
@@ -6,21 +6,21 @@ namespace Xamarin.Forms
 	[RenderWith(typeof(_CarouselViewRenderer))]
 	public class CarouselView : ItemsView, ICarouselViewController
 	{
-		public static readonly BindableProperty PositionProperty = 
+		public static readonly BindableProperty PositionProperty =
 			BindableProperty.Create(
-				propertyName: nameof(Position), 
-				returnType: typeof(int), 
-				declaringType: typeof(CarouselView), 
-				defaultValue: 0, 
+				propertyName: nameof(Position),
+				returnType: typeof(int),
+				declaringType: typeof(CarouselView),
+				defaultValue: 0,
 				defaultBindingMode: BindingMode.TwoWay
 			);
 
-		public static readonly BindableProperty ItemProperty = 
+		public static readonly BindableProperty ItemProperty =
 			BindableProperty.Create(
-				propertyName: nameof(Item), 
-				returnType: typeof(object), 
-				declaringType: typeof(CarouselView), 
-				defaultValue: null, 
+				propertyName: nameof(Item),
+				returnType: typeof(object),
+				declaringType: typeof(CarouselView),
+				defaultValue: null,
 				defaultBindingMode: BindingMode.TwoWay
 			);
 
@@ -48,13 +48,25 @@ namespace Xamarin.Forms
 
 		public int Position
 		{
-			get { return (int)GetValue(PositionProperty); }
-			set { SetValue(PositionProperty, value); }
+			get
+			{
+				return (int)GetValue(PositionProperty);
+			}
+			set
+			{
+				SetValue(PositionProperty, value);
+			}
 		}
 		public object Item
 		{
-			get { return GetValue(ItemProperty); }
-			internal set { SetValue(ItemProperty, value); }
+			get
+			{
+				return GetValue(ItemProperty);
+			}
+			internal set
+			{
+				SetValue(ItemProperty, value);
+			}
 		}
 
 		public event EventHandler<SelectedItemChangedEventArgs> ItemSelected;
@@ -80,8 +92,8 @@ namespace Xamarin.Forms
 				return;
 			_lastItem = item;
 
-            Item = item;
-            ItemSelected?.Invoke(this, new SelectedItemChangedEventArgs(item));
+			Item = item;
+			ItemSelected?.Invoke(this, new SelectedItemChangedEventArgs(item));
 		}
 		void ICarouselViewController.SendSelectedPositionChanged(int position)
 		{
@@ -89,7 +101,7 @@ namespace Xamarin.Forms
 				return;
 			_lastPosition = position;
 
-            Item = ((IItemViewController)this).GetItem(position);
+			Item = ((IItemViewController)this).GetItem(position);
 			PositionSelected?.Invoke(this, new SelectedPositionChangedEventArgs(position));
 		}
 	}
diff --git a/Xamarin.Forms.Core/IItemViewController.cs b/Xamarin.Forms.Core/IItemViewController.cs
index 0876f602..ca4c51ee 100644
--- a/Xamarin.Forms.Core/IItemViewController.cs
+++ b/Xamarin.Forms.Core/IItemViewController.cs
@@ -6,6 +6,9 @@
 		View CreateView(object itemType);
 		object GetItem(int index);
 		object GetItemType(object item);
-        int Count { get; }
+		int Count
+		{
+			get;
+		}
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Core/ItemsViewSimple.cs b/Xamarin.Forms.Core/ItemsViewSimple.cs
index 59858d22..8ad82b7f 100644
--- a/Xamarin.Forms.Core/ItemsViewSimple.cs
+++ b/Xamarin.Forms.Core/ItemsViewSimple.cs
@@ -9,18 +9,18 @@ namespace Xamarin.Forms
 {
 	public abstract class ItemsView : View, IItemViewController
 	{
-		public static readonly BindableProperty ItemsSourceProperty = 
+		public static readonly BindableProperty ItemsSourceProperty =
 			BindableProperty.Create(
 				propertyName: "ItemsSource",
-				returnType: typeof(IEnumerable), 
-				declaringType: typeof(ItemsView), 
+				returnType: typeof(IEnumerable),
+				declaringType: typeof(ItemsView),
 				defaultValue: Enumerable.Empty<object>()
 			);
 
-		public static readonly BindableProperty ItemTemplateProperty = 
+		public static readonly BindableProperty ItemTemplateProperty =
 			BindableProperty.Create(
-				propertyName: "ItemTemplate", 
-				returnType: typeof(DataTemplate), 
+				propertyName: "ItemTemplate",
+				returnType: typeof(DataTemplate),
 				declaringType: typeof(ItemsView)
 			);
 
@@ -32,14 +32,26 @@ namespace Xamarin.Forms
 
 		public IEnumerable ItemsSource
 		{
-			get { return (IEnumerable)GetValue(ItemsSourceProperty); }
-			set { SetValue(ItemsSourceProperty, value); }
+			get
+			{
+				return (IEnumerable)GetValue(ItemsSourceProperty);
+			}
+			set
+			{
+				SetValue(ItemsSourceProperty, value);
+			}
 		}
 
 		public DataTemplate ItemTemplate
 		{
-			get { return (DataTemplate)GetValue(ItemTemplateProperty); }
-			set { SetValue(ItemTemplateProperty, value); }
+			get
+			{
+				return (DataTemplate)GetValue(ItemTemplateProperty);
+			}
+			set
+			{
+				SetValue(ItemTemplateProperty, value);
+			}
 		}
 
 		int IItemViewController.Count => _itemSource.Count;
@@ -80,7 +92,7 @@ namespace Xamarin.Forms
 				var itemsSource = ItemsSource;
 				if (itemsSource == null)
 					itemsSource = Enumerable.Empty<object>();
-				
+
 				// abstract enumerable, IList, IList<T>, and IReadOnlyList<T>
 				_itemSource = new ItemSource(itemsSource);
 
@@ -233,7 +245,10 @@ namespace Xamarin.Forms
 					return true;
 				}
 
-				public object Current { get; private set; }
+				public object Current
+				{
+					get; private set;
+				}
 
 				public void Reset()
 				{
@@ -264,7 +279,10 @@ namespace Xamarin.Forms
 					Enumerable = list.Cast<object>().ToArray();
 				}
 
-				internal IEnumerable Enumerable { get; }
+				internal IEnumerable Enumerable
+				{
+					get;
+				}
 
 				internal int Count
 				{