             "iconDate REAL, " +
             "iconType INTEGER, " +
             "iconWidth INTEGER, " +
-            "frecencies REAL)"
-    }
-
-    func getDomainsTableCreationString() -> String {
-        return "CREATE TABLE IF NOT EXISTS \(TableDomains) (" +
-                   "id INTEGER PRIMARY KEY AUTOINCREMENT, " +
-                   "domain TEXT NOT NULL UNIQUE, " +
-                   "showOnTopSites TINYINT NOT NULL DEFAULT 1" +
-               ")"
-    }
-
-    func getQueueTableCreationString() -> String {
-        return "CREATE TABLE IF NOT EXISTS \(TableQueuedTabs) (" +
-                   "url TEXT NOT NULL UNIQUE, " +
-                   "title TEXT" +
-               ") "
-    }
+            "frecencies REAL" +
+        ")"
+
+    let domainsTableCreate =
+        "CREATE TABLE IF NOT EXISTS \(TableDomains) (" +
+           "id INTEGER PRIMARY KEY AUTOINCREMENT, " +
+           "domain TEXT NOT NULL UNIQUE, " +
+           "showOnTopSites TINYINT NOT NULL DEFAULT 1" +
+       ")"
+
+    let queueTableCreate =
+        "CREATE TABLE IF NOT EXISTS \(TableQueuedTabs) (" +
+            "url TEXT NOT NULL UNIQUE, " +
+            "title TEXT" +
+        ") "
 
     func getBookmarksMirrorTableCreationString() -> String {
         // The stupid absence of naming conventions here is thanks to pre-Sync Weave. Sorry.

        }

        if from < 11 && to >= 11 {
            if !self.run(db, sql: getTopSitesTableCreationString()) {
                return false
            }
        }

        return self.run(db, sql: sql, args: args)
    }

    let topSitesTableCreate =
        "CREATE TABLE IF NOT EXISTS \(TableCachedTopSites) (" +
            "historyID INTEGER, " +
            "url TEXT NOT NULL, " +
            "title TEXT NOT NULL, " +
