diff --git a/cura/Settings/ExtrudersModel.py b/cura/Settings/ExtrudersModel.py
index 955bd9dbb2..5f10ac99d4 100644
--- a/cura/Settings/ExtrudersModel.py
+++ b/cura/Settings/ExtrudersModel.py
@@ -165,7 +165,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
     def __updateExtruders(self):
         extruders_changed = False
 
-        if self.rowCount() != 0:
+        if self.count != 0:
             extruders_changed = True
 
         items = []
diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index be4a4e2b4e..7e1a06f45c 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -1540,7 +1540,7 @@ class MachineManager(QObject):
             elif word.isdigit():
                 abbr_machine += word
             else:
-                stripped_word = ''.join(char for char in unicodedata.normalize('NFD', word.upper()) if unicodedata.category(char) != 'Mn')
+                stripped_word = "".join(char for char in unicodedata.normalize("NFD", word.upper()) if unicodedata.category(char) != "Mn")
                 # - use only the first character if the word is too long (> 3 characters)
                 # - use the whole word if it's not too long (<= 3 characters)
                 if len(stripped_word) > 3:
diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 004b4e3cfc..c88a721a84 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Ultimaker B.V.
+// Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.2
@@ -23,7 +23,7 @@ Cura.MachineAction
         target: base.extrudersModel
         onModelChanged:
         {
-            var extruderCount = base.extrudersModel.rowCount();
+            var extruderCount = base.extrudersModel.count;
             base.extruderTabsCount = extruderCount;
         }
     }
diff --git a/resources/qml/Dialogs/AddMachineDialog.qml b/resources/qml/Dialogs/AddMachineDialog.qml
index 8b2b9d1868..bcf5807949 100644
--- a/resources/qml/Dialogs/AddMachineDialog.qml
+++ b/resources/qml/Dialogs/AddMachineDialog.qml
@@ -170,7 +170,7 @@ UM.Dialog
                     if (machineList.model.getItem(machineList.currentIndex).section != section)
                     {
                         // Find the first machine from this section
-                        for(var i = 0; i < machineList.model.rowCount(); i++)
+                        for(var i = 0; i < machineList.model.count; i++)
                         {
                             var item = machineList.model.getItem(i);
                             if (item.section == section)
diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
index 202bc22ce0..9927ad1498 100644
--- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
+++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
@@ -44,7 +44,7 @@ Cura.ExpandableComponent
             delegate: Item
             {
                 height: parent.height
-                width: Math.round(ListView.view.width / extrudersModel.rowCount())
+                width: Math.round(ListView.view.width / extrudersModel.count)
 
                 // Extruder icon. Shows extruder index and has the same color as the active material.
                 Cura.ExtruderIcon
diff --git a/resources/qml/Menus/ProfileMenu.qml b/resources/qml/Menus/ProfileMenu.qml
index ffd3c556b6..e09b7930a8 100644
--- a/resources/qml/Menus/ProfileMenu.qml
+++ b/resources/qml/Menus/ProfileMenu.qml
@@ -34,7 +34,7 @@ Menu
     MenuSeparator
     {
         id: customSeparator
-        visible: Cura.CustomQualityProfilesDropDownMenuModel.rowCount > 0
+        visible: Cura.CustomQualityProfilesDropDownMenuModel.count > 0
     }
 
     Instantiator
@@ -45,7 +45,7 @@ Menu
         Connections
         {
             target: Cura.CustomQualityProfilesDropDownMenuModel
-            onModelReset: customSeparator.visible = Cura.CustomQualityProfilesDropDownMenuModel.rowCount() > 0
+            onModelReset: customSeparator.visible = Cura.CustomQualityProfilesDropDownMenuModel.count > 0
         }
 
         MenuItem
@@ -59,12 +59,12 @@ Menu
 
         onObjectAdded:
         {
-            customSeparator.visible = model.rowCount() > 0;
+            customSeparator.visible = model.count > 0;
             menu.insertItem(index, object);
         }
         onObjectRemoved:
         {
-            customSeparator.visible = model.rowCount() > 0;
+            customSeparator.visible = model.count > 0;
             menu.removeItem(object);
         }
     }
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 4dc5465dc6..bc75b9bc72 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -21,8 +21,10 @@ UM.ManagementPage
 
     function activeMachineIndex()
     {
-        for(var i = 0; i < model.rowCount(); i++) {
-            if (model.getItem(i).id == Cura.MachineManager.activeMachineId) {
+        for(var i = 0; i < model.count; i++)
+        {
+            if (model.getItem(i).id == Cura.MachineManager.activeMachineId)
+            {
                 return i;
             }
         }
@@ -47,7 +49,7 @@ UM.ManagementPage
         {
             text: catalog.i18nc("@action:button", "Remove");
             iconName: "list-remove";
-            enabled: base.currentItem != null && model.rowCount() > 1
+            enabled: base.currentItem != null && model.count > 1
             onClicked: confirmDialog.open();
         },
         Button
diff --git a/resources/qml/Preferences/Materials/MaterialsList.qml b/resources/qml/Preferences/Materials/MaterialsList.qml
index 00bead9650..61f92db84c 100644
--- a/resources/qml/Preferences/Materials/MaterialsList.qml
+++ b/resources/qml/Preferences/Materials/MaterialsList.qml
@@ -57,7 +57,7 @@ Item
             var currentItemId = base.currentItem == null ? "" : base.currentItem.root_material_id
             search_root_id = currentItemId
         }
-        for (var material_idx = 0; material_idx < genericMaterialsModel.rowCount(); material_idx++)
+        for (var material_idx = 0; material_idx < genericMaterialsModel.count; material_idx++)
         {
             var material = genericMaterialsModel.getItem(material_idx)
             if (material.root_material_id == search_root_id)
@@ -72,15 +72,15 @@ Item
                 return true
             }
         }
-        for (var brand_idx = 0; brand_idx < materialsModel.rowCount(); brand_idx++)
+        for (var brand_idx = 0; brand_idx < materialsModel.count; brand_idx++)
         {
             var brand = materialsModel.getItem(brand_idx)
             var types_model = brand.material_types
-            for (var type_idx = 0; type_idx < types_model.rowCount(); type_idx++)
+            for (var type_idx = 0; type_idx < types_model.count; type_idx++)
             {
                 var type = types_model.getItem(type_idx)
                 var colors_model = type.colors
-                for (var material_idx = 0; material_idx < colors_model.rowCount(); material_idx++)
+                for (var material_idx = 0; material_idx < colors_model.count; material_idx++)
                 {
                     var material = colors_model.getItem(material_idx)
                     if (material.root_material_id == search_root_id)
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index ba0c2848a5..d7ffbb3152 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -188,21 +188,27 @@ Item
     Connections
     {
         target: qualitiesModel
-        onItemsChanged: {
+        onItemsChanged:
+        {
             var toSelectItemName = base.currentItem == null ? "" : base.currentItem.name;
-            if (newQualityNameToSelect != "") {
+            if (newQualityNameToSelect != "")
+            {
                 toSelectItemName = newQualityNameToSelect;
             }
 
             var newIdx = -1;  // Default to nothing if nothing can be found
-            if (toSelectItemName != "") {
+            if (toSelectItemName != "")
+            {
                 // Select the required quality name if given
-                for (var idx = 0; idx < qualitiesModel.rowCount(); ++idx) {
+                for (var idx = 0; idx < qualitiesModel.count; ++idx)
+                {
                     var item = qualitiesModel.getItem(idx);
-                    if (item.name == toSelectItemName) {
+                    if (item.name == toSelectItemName)
+                    {
                         // Switch to the newly created profile if needed
                         newIdx = idx;
-                        if (base.toActivateNewQuality) {
+                        if (base.toActivateNewQuality)
+                        {
                             // Activate this custom quality if required
                             Cura.MachineManager.setQualityChangesGroup(item.quality_changes_group);
                         }
@@ -382,9 +388,11 @@ Item
                     var selectedItemName = Cura.MachineManager.activeQualityOrQualityChangesName;
 
                     // Select the required quality name if given
-                    for (var idx = 0; idx < qualitiesModel.rowCount(); idx++) {
+                    for (var idx = 0; idx < qualitiesModel.count; idx++)
+                    {
                         var item = qualitiesModel.getItem(idx);
-                        if (item.name == selectedItemName) {
+                        if (item.name == selectedItemName)
+                        {
                             currentIndex = idx;
                             break;
                         }
diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index 8896d0611e..bb47301b69 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -54,7 +54,7 @@ UM.PreferencesPage
                 {
                     return Qt.Unchecked
                 }
-                else if(definitionsModel.visibleCount == definitionsModel.rowCount(null))
+                else if(definitionsModel.visibleCount == definitionsModel.count)
                 {
                     return Qt.Checked
                 }
diff --git a/resources/qml/Settings/SettingOptionalExtruder.qml b/resources/qml/Settings/SettingOptionalExtruder.qml
index a3c1422b30..5f0d8327f8 100644
--- a/resources/qml/Settings/SettingOptionalExtruder.qml
+++ b/resources/qml/Settings/SettingOptionalExtruder.qml
@@ -1,5 +1,5 @@
-// Copyright (c) 2016 Ultimaker B.V.
-// Uranium is released under the terms of the LGPLv3 or higher.
+// Copyright (c) 2018 Ultimaker B.V.
+// Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
 import QtQuick.Controls 2.0
@@ -31,12 +31,15 @@ SettingItem
             {
                 forceActiveFocus();
                 propertyProvider.setPropertyValue("value", model.getItem(index).index);
-            } else
+            }
+            else
             {
                 if (propertyProvider.properties.value == -1)
                 {
-                    control.currentIndex = model.rowCount() - 1;  // we know the last item is "Not overriden"
-                } else {
+                    control.currentIndex = model.count - 1;  // we know the last item is "Not overriden"
+                }
+                else
+                {
                     control.currentIndex = propertyProvider.properties.value;  // revert to the old value
                 }
             }
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 5e723a3d70..e07810691e 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -106,7 +106,7 @@ Item
                         var availableMin = -1
                         var availableMax = -1
 
-                        for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.rowCount(); i++)
+                        for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.count; i++)
                         {
                             var qualityItem = Cura.QualityProfilesDropDownMenuModel.getItem(i)
 
@@ -183,7 +183,7 @@ Item
                         qualityModel.existingQualityProfile = 0
 
                         // check, the ticks count cannot be less than zero
-                        qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.rowCount() - 1)
+                        qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.count - 1)
                     }
                 }
 
@@ -1156,7 +1156,7 @@ Item
     function populateExtruderModel()
     {
         extruderModel.clear();
-        for(var extruderNumber = 0; extruderNumber < extruders.rowCount() ; extruderNumber++)
+        for(var extruderNumber = 0; extruderNumber < extruders.count; extruderNumber++)
         {
             extruderModel.append({
                 text: extruders.getItem(extruderNumber).name,
diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 0240aaab26..4e00bd7248 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -65,7 +65,7 @@ Item
                     style: UM.Theme.styles.toolbar_button
 
                     property bool isFirstElement: toolsModel.getItem(0).id == model.id
-                    property bool isLastElement: toolsModel.getItem(toolsModel.rowCount() - 1).id == model.id
+                    property bool isLastElement: toolsModel.getItem(toolsModel.count - 1).id == model.id
 
                     onCheckedChanged:
                     {
diff --git a/resources/qml/ViewsSelector.qml b/resources/qml/ViewsSelector.qml
index e9fdd57177..e239ea82a0 100644
--- a/resources/qml/ViewsSelector.qml
+++ b/resources/qml/ViewsSelector.qml
@@ -19,7 +19,7 @@ Cura.ExpandableComponent
 
     property var activeView:
     {
-        for (var i = 0; i < viewModel.rowCount(); i++)
+        for (var i = 0; i < viewModel.count; i++)
         {
             if (viewModel.items[i].active)
             {