diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index 72c4b9917..68d7ad065 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -93,7 +93,7 @@ void Config::ReadValues() {
         Settings::values.profiles.emplace_back(std::move(profile));
     };
 
-    int size = qt_config->beginReadArray("profiles");
+    const int num_input_profiles = qt_config->beginReadArray("profiles");
 
     for (int i = 0; i < size; ++i) {
         qt_config->setArrayIndex(i);
diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp
index fdb0ef8d6..efc893e07 100644
--- a/src/citra_qt/configuration/configure_input.cpp
+++ b/src/citra_qt/configuration/configure_input.cpp
@@ -100,7 +100,9 @@ ConfigureInput::ConfigureInput(QWidget* parent)
     ui->setupUi(this);
     setFocusPolicy(Qt::ClickFocus);
 
-    for (int i = 0; i < Settings::values.profiles.size(); ++i) {
+    for (const auto& profile : Settings::values::profiles) {
+        ui->profile->addItem(QString::fromStdString(profile.name));
+    }
         ui->profile->addItem(QString::fromStdString(Settings::values.profiles[i].name));
     }
 
@@ -389,7 +391,7 @@ void ConfigureInput::retranslateUi() {
 }
 
 void ConfigureInput::newProfile() {
-    QString name =
+    const QString name =
         QInputDialog::getText(this, tr("New Profile"), tr("Enter the name for the new profile."));
     if (name.isEmpty()) {
         return;
@@ -407,12 +409,12 @@ void ConfigureInput::deleteProfile() {
         QMessageBox::critical(this, tr("Citra"), tr("You need to have 1 profile at least"));
         return;
     }
-    QMessageBox::StandardButton answer = QMessageBox::question(
+    const auto answer = QMessageBox::question(
         this, tr("Delete Profile"), tr("Delete profile %1?").arg(ui->profile->currentText()));
     if (answer != QMessageBox::Yes) {
         return;
     }
-    int index = ui->profile->currentIndex();
+    const int index = ui->profile->currentIndex();
     ui->profile->removeItem(index);
     ui->profile->setCurrentIndex(0);
     Settings::DeleteProfile(index);
@@ -420,7 +422,7 @@ void ConfigureInput::deleteProfile() {
 }
 
 void ConfigureInput::renameProfile() {
-    QString new_name = QInputDialog::getText(this, tr("Rename Profile"), tr("New name:"));
+    const QString new_name = QInputDialog::getText(this, tr("Rename Profile"), tr("New name:"));
     if (new_name.isEmpty()) {
         return;
     }
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index f7206c93d..28d26e6ed 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -1327,7 +1327,7 @@ void GMainWindow::OnConfigure() {
             &GMainWindow::OnLanguageChanged);
     auto old_theme = UISettings::values.theme;
     const int old_profile = Settings::values.profile;
-    auto old_profiles = Settings::values.profiles;
+    const auto old_profiles = Settings::values.profiles;
     const bool old_discord_presence = UISettings::values.enable_discord_presence;
     auto result = configureDialog.exec();
     if (result == QDialog::Accepted) {
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index ec7af5b5a..da6a97d81 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -133,7 +133,7 @@ void CreateProfile(std::string name) {
     profile.udp_input_address = values.udp_input_address;
     profile.udp_input_port = values.udp_input_port;
     profile.udp_pad_index = values.udp_pad_index;
-    values.profiles.push_back(profile);
+    values.profiles.push_back(std::move(profile));
     values.profile = static_cast<int>(values.profiles.size()) - 1;
     LoadProfile(values.profile);
 }
diff --git a/src/core/settings.h b/src/core/settings.h
index e179b610d..50e02f0df 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -117,8 +117,8 @@ struct Values {
     u16 udp_input_port;
     u8 udp_pad_index;
 
-    int profile;                        ///< The current input profile index
-    std::vector<InputProfile> profiles; ///< The list of input profiles
+    int current_input_profile;                        ///< The current input profile index
+    std::vector<InputProfile> input_profiles; ///< The list of input profiles
 
     // Core
     bool use_cpu_jit;