     */
     func adjustContentSize(_ mode: T2GLayoutMode? = nil) {
         if let m = mode {
-            self.contentSize = self.contentSizeForMode(m)
+            contentSize = contentSizeForMode(m)
         } else {
-            self.contentSize = self.contentSizeForMode(self.layoutMode)
-        }
-        if self.contentSize.height <= self.frame.height {
-            self.contentSize = CGSize(width: self.frame.width, height: self.frame.height + 1)
+            contentSize = contentSizeForMode(layoutMode)
+        }
+        if contentSize.height <= frame.height {
+            contentSize = CGSize(width: frame.width, height: frame.height + 1)
         }
     }
     

    func indexForIndexPath(_ indexPath: IndexPath) -> Int {
        var totalIndex = indexPath.row
        for section in 0..<indexPath.section {
            totalIndex += self.dataDelegate!.numberOfCellsInSection(section)
        }
        
        return totalIndex

    :returns: Array of integer values representing the total indices of the cells.
    */
    func indicesForVisibleCells(_ mode: T2GLayoutMode) -> [Int] {
        let frame = bounds
        var res = [Int]()
        
        if let dimensions = dataDelegate?.dimensionsForCell(mode) {
