diff --git a/Artemis/Artemis/Profiles/Layers/Models/TweenModel.cs b/Artemis/Artemis/Profiles/Layers/Models/TweenModel.cs
index 70bb2b63f..9f180fb87 100644
--- a/Artemis/Artemis/Profiles/Layers/Models/TweenModel.cs
+++ b/Artemis/Artemis/Profiles/Layers/Models/TweenModel.cs
@@ -1,135 +1,126 @@
-using System;
-using Betwixt;
-
-namespace Artemis.Profiles.Layers.Models
-{
-    public class TweenModel
-    {
-        private readonly LayerModel _layerModel;
-        private Tweener<float> _xTweener;
-        private Tweener<float> _yTweener;
-        private float _width;
-        private Tweener<float> _widthTweener;
-        private float _height;
-        private Tweener<float> _heightTweener;
-        private float _opacity;
-        private Tweener<float> _opacityTweener;
-        private float _x;
-        private float _y;
-
-        public TweenModel(LayerModel layerModel)
-        {
-            _layerModel = layerModel;
-            _xTweener = new Tweener<float>((float) layerModel.X, (float) layerModel.X, 0);
-            _yTweener = new Tweener<float>((float) layerModel.Y, (float) layerModel.Y, 0);
-            _widthTweener = new Tweener<float>((float) layerModel.Width, (float) layerModel.Width, 0);
-            _heightTweener = new Tweener<float>((float) layerModel.Height, (float) layerModel.Height, 0);
+using System;
+using Betwixt;
+
+namespace Artemis.Profiles.Layers.Models
+{
+    public class TweenModel
+    {
+        private readonly LayerModel _layerModel;
+        private Tweener<float> _xTweener;
+        private Tweener<float> _yTweener;
+        private float _width;
+        private Tweener<float> _widthTweener;
+        private float _height;
+        private Tweener<float> _heightTweener;
+        private float _opacity;
+        private Tweener<float> _opacityTweener;
+        private float _x;
+        private float _y;
+
+        public TweenModel(LayerModel layerModel)
+        {
+            _layerModel = layerModel;
+            _xTweener = new Tweener<float>((float) layerModel.X, (float) layerModel.X, 0);
+            _yTweener = new Tweener<float>((float) layerModel.Y, (float) layerModel.Y, 0);
+            _widthTweener = new Tweener<float>((float) layerModel.Width, (float) layerModel.Width, 0);
+            _heightTweener = new Tweener<float>((float) layerModel.Height, (float) layerModel.Height, 0);
             _opacityTweener = new Tweener<float>((float) layerModel.Opacity, (float) layerModel.Opacity, 0);
 
-            _x = (float)_layerModel.X;
-            _y = (float)_layerModel.Y;
-            _width = (float)_layerModel.Width;
-            _height = (float)_layerModel.Height;
-            _opacity = (float)_layerModel.Opacity;
-        }
-
-        public void Update()
-        {
-            UpdateWidth();
-            UpdateHeight();
-            UpdateOpacity();
-        }
-
-        private void UpdateWidth()
+            _x = (float)_layerModel.X;
+            _y = (float)_layerModel.Y;
+            _width = (float)_layerModel.Width;
+            _height = (float)_layerModel.Height;
+            _opacity = (float)_layerModel.Opacity;
+        }
+
+        public void Update()
         {
-            if (Math.Abs(_layerModel.Properties.WidthEaseTime) < 0.001) 
+            UpdateWidth();
+            UpdateHeight();
+            UpdateOpacity();
+        }
+
+        private void UpdateWidth()
+        {
+            if (_layerModel.Properties.WidthEaseTime < 0.001) 
                 return;
 
             // Width
-            if (Math.Abs(_layerModel.Width - _width) > 0.001)
-            {
-                var widthFunc = GetEaseFunction(_layerModel.Properties.WidthEase);
-                var widthSpeed = _layerModel.Properties.WidthEaseTime;
-
-                _xTweener = new Tweener<float>(_xTweener.Value, (float)_layerModel.X, widthSpeed, widthFunc);
-                _widthTweener = new Tweener<float>(_widthTweener.Value, (float)_layerModel.Width, widthSpeed, widthFunc);
+            if (Math.Abs(_layerModel.Width - _width) > 0.001)
+            {
+                var widthFunc = GetEaseFunction(_layerModel.Properties.WidthEase);
+                var widthSpeed = _layerModel.Properties.WidthEaseTime;
+
+                _xTweener = new Tweener<float>(_xTweener.Value, (float)_layerModel.X, widthSpeed, widthFunc);
+                _widthTweener = new Tweener<float>(_widthTweener.Value, (float)_layerModel.Width, widthSpeed, widthFunc);
             }
 
             _xTweener.Update(40);
-            _widthTweener.Update(40);
-
-            _x = (float) _layerModel.X;
-            _width = (float)_layerModel.Width;
-
-            _layerModel.X = _xTweener.Value;
-            _layerModel.Width = _widthTweener.Value;
-        }
-
-        private void UpdateHeight()
+            _widthTweener.Update(40);
+
+            _x = (float) _layerModel.X;
+            _width = (float)_layerModel.Width;
+
+            _layerModel.X = _xTweener.Value;
+            _layerModel.Width = _widthTweener.Value;
+        }
+
+        private void UpdateHeight()
         {
-            if (Math.Abs(_layerModel.Properties.HeightEaseTime) < 0.001)
-                return;
-
-            // Height
-            if (Math.Abs(_layerModel.Height - _height) > 0.001)
-            {
-                var heightFunc = GetEaseFunction(_layerModel.Properties.HeightEase);
-                var heightSpeed = _layerModel.Properties.HeightEaseTime;
-                _yTweener = new Tweener<float>(_y, (float)_layerModel.Y, heightSpeed, heightFunc);
-                _heightTweener = new Tweener<float>(_height, (float)_layerModel.Height, heightSpeed, heightFunc);
+            if (_layerModel.Properties.HeightEaseTime < 0.001)
+                return;
+
+            // Height
+            if (Math.Abs(_layerModel.Height - _height) > 0.001)
+            {
+                var heightFunc = GetEaseFunction(_layerModel.Properties.HeightEase);
+                var heightSpeed = _layerModel.Properties.HeightEaseTime;
+                _yTweener = new Tweener<float>(_y, (float)_layerModel.Y, heightSpeed, heightFunc);
+                _heightTweener = new Tweener<float>(_height, (float)_layerModel.Height, heightSpeed, heightFunc);
             }
 
-            _yTweener.Update(40);
-            _heightTweener.Update(40);
-
-            _y = (float)_layerModel.Y;
-            _height = (float)_layerModel.Height;
-
-            _layerModel.Y = _yTweener.Value;
-            _layerModel.Height = _heightTweener.Value;
-        }
-
-        private void UpdateOpacity()
+            _yTweener.Update(40);
+            _heightTweener.Update(40);
+
+            _y = (float)_layerModel.Y;
+            _height = (float)_layerModel.Height;
+
+            _layerModel.Y = _yTweener.Value;
+            _layerModel.Height = _heightTweener.Value;
+        }
+
+        private void UpdateOpacity()
         {
-            if (Math.Abs(_layerModel.Properties.OpacityEaseTime) < 0.001)
-                return;
-
-            // Opacity
-            if (Math.Abs(_layerModel.Opacity - _opacity) > 0.001)
-            {
-                _opacityTweener = new Tweener<float>(_opacity, (float)_layerModel.Opacity,
-                    _layerModel.Properties.OpacityEaseTime, GetEaseFunction(_layerModel.Properties.OpacityEase));
-            }
-
-            _opacityTweener.Update(40);
-
-            _opacity = (float)_layerModel.Opacity;
-
-            _layerModel.Opacity = _opacityTweener.Value;
-        }
-
-        private void StoreCurrentValues()
-        {
-            _x = (float) _layerModel.X;
-            _y = (float) _layerModel.Y;
-            _width = (float) _layerModel.Width;
-            _height = (float) _layerModel.Height;
-            _opacity = (float) _layerModel.Opacity;
-        }
-
-        private static EaseFunc GetEaseFunction(string functionName)
-        {
-            switch (functionName)
-            {
-                case "In":
-                    return Ease.Quint.In;
-                case "Out":
-                    return Ease.Quint.Out;
-                case "In/out":
-                    return Ease.Quint.InOut;
-                default:
-                    return Ease.Linear;
-            }
-        }
-    }
+            if (_layerModel.Properties.OpacityEaseTime < 0.001)
+                return;
+
+            // Opacity
+            if (Math.Abs(_layerModel.Opacity - _opacity) > 0.001)
+            {
+                _opacityTweener = new Tweener<float>(_opacity, (float)_layerModel.Opacity,
+                    _layerModel.Properties.OpacityEaseTime, GetEaseFunction(_layerModel.Properties.OpacityEase));
+            }
+
+            _opacityTweener.Update(40);
+
+            _opacity = (float)_layerModel.Opacity;
+
+            _layerModel.Opacity = _opacityTweener.Value;
+        }
+
+        private static EaseFunc GetEaseFunction(string functionName)
+        {
+            switch (functionName)
+            {
+                case "In":
+                    return Ease.Quint.In;
+                case "Out":
+                    return Ease.Quint.Out;
+                case "In/out":
+                    return Ease.Quint.InOut;
+                default:
+                    return Ease.Linear;
+            }
+        }
+    }
 }
\ No newline at end of file