         super.viewDidLoad()
 
         if #available(iOS 10.0, *) {
-            self.automaticallyAdjustsScrollViewInsets = false
+            automaticallyAdjustsScrollViewInsets = false
         }
 
-        self.tableView.register(
+        tableView.register(
             SearchResultsViewCell.self, forCellReuseIdentifier: SearchResultsViewCell.reuseIdentifier
         )
-        self.tableView.register(
+        tableView.register(
             UINib(nibName: "SearchResultsViewCell", bundle: MapViewController.bundle),
             forCellReuseIdentifier: SearchResultsViewCell.reuseIdentifier
         )


        if #available(iOS 10.0, *) {
            let correctOffset = presentingViewController!.topLayoutGuide.length
            self.tableView.contentInset.top = correctOffset
            self.tableView.scrollIndicatorInsets.top = correctOffset
        }
    }

    override open func didReceiveMemoryWarning() {
        super.didReceiveMemoryWarning()

        self.mapItems = []
    }

    // MARK: UITableViewDataSource


    override open func tableView(_ tableView: UITableView,
                                 numberOfRowsInSection section: Int) -> Int {
        return mapItems.count
    }

    override open func tableView(_ tableView: UITableView,
