diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
index 691dbfa0..972ea7ca 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift
@@ -134,6 +134,7 @@ open class BarsIndicatorView: CarouselIndicator {
     public override func assessTouchOf(_ touchPoint_X: CGFloat) {
         
         currentIndex = barReferences.firstIndex { $0.0.frame.maxX >= touchPoint_X && $0.0.frame.minX <= touchPoint_X } ?? 0
+        performAction()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
diff --git a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
index d1f12d85..9380e8c0 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
@@ -48,13 +48,10 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
             previousIndex = currentIndex
             carouselIndicatorModel?.currentIndex = newIndex
             
-            if previousIndex != newIndex {
-                updateUI(previousIndex: previousIndex,
-                         newIndex: newIndex,
-                         totalCount: numberOfPages,
-                         isAnimated: carouselIndicatorModel?.animated ?? true)
-                performAction()
-            }
+            updateUI(previousIndex: previousIndex,
+                     newIndex: newIndex,
+                     totalCount: numberOfPages,
+                     isAnimated: carouselIndicatorModel?.animated ?? true)
         }
     }
     
@@ -141,11 +138,13 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
     
     func incrementCurrentIndex() {
         currentIndex = (currentIndex + 1) % numberOfPages
+        performAction()
     }
     
     func decrementCurrentIndex() {
         let newIndex = currentIndex - 1
         currentIndex = newIndex < 0 ? numberOfPages - 1 : newIndex
+        performAction()
     }
     
     /// Increments the currentIndex value.
diff --git a/MVMCoreUI/Atomic/Organisms/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel.swift
index 5fd0df36..4cf65f1b 100644
--- a/MVMCoreUI/Atomic/Organisms/Carousel.swift
+++ b/MVMCoreUI/Atomic/Organisms/Carousel.swift
@@ -26,10 +26,8 @@ open class Carousel: View {
     
     /// The index of the page, does not include dummy cells.
     public var pageIndex: Int {
-        get {
-            return loop ? currentIndex - 2 : currentIndex
-        }
-        set(newIndex) {
+        get { return loop ? currentIndex - 2 : currentIndex }
+        set (newIndex) {
             currentIndex = loop ? newIndex + 2 : newIndex
         }
     }
@@ -90,6 +88,7 @@ open class Carousel: View {
         }
     }
     
+    //--------------------------------------------------
     // MARK: - MVMCoreViewProtocol
     //--------------------------------------------------
     
@@ -194,7 +193,7 @@ open class Carousel: View {
             pagingView = MoleculeObjectMapping.shared()?.createMolecule(molecule, delegateObject: delegateObject) as? (UIView & CarouselPageControlProtocol)
         }
         
-        addPaging(view: pagingView , position: (CGFloat(molecule?.position ?? 20)))
+        addPaging(view: pagingView, position: (CGFloat(molecule?.position ?? 20)))
     }
     
     /// Registers the cells with the collection view
@@ -213,9 +212,7 @@ open class Carousel: View {
     
     /// Returns the (identifier, class) of the molecule for the given map.
     func getMoleculeInfo(with molecule: MoleculeModelProtocol, delegateObject: MVMCoreUIDelegateObject?) -> (identifier: String, class: AnyClass, molecule: MoleculeModelProtocol)? {
-        guard let className = MoleculeObjectMapping.shared()?.getMoleculeClass(molecule) else {
-            return nil
-        }
+        guard let className = MoleculeObjectMapping.shared()?.getMoleculeClass(molecule) else { return nil }
         return (className.nameForReuse(with: molecule, delegateObject) ?? molecule.moleculeName, className, molecule)
     }
     
diff --git a/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift b/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift
index db0de647..91f461dd 100644
--- a/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift
+++ b/MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift
@@ -45,8 +45,8 @@ extension MoleculeViewProtocol {
     }
 
     // Do nothing, optionals.
-    public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {}
-    public func reset() {}
+    public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { }
+    public func reset() { }
 
     public static func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return nil