diff --git a/bin/pwnagotchi b/bin/pwnagotchi
index 0ac3d20e..3a022504 100755
--- a/bin/pwnagotchi
+++ b/bin/pwnagotchi
@@ -188,12 +188,12 @@ if __name__ == '__main__':
                     if pwn_name == "":
                         pwn_name = "Pwnagotchi"
                         print("I shall go by Pwnagotchi from now on!")
-                        pwn_name = "main.name = \"" + pwn_name + "\"\n"
+                        pwn_name = "main.name = \"%s\"\n" % pwn_name
                         f.write(pwn_name)
                     else:
                         if is_valid_hostname(pwn_name):
-                            print("I shall go by %s from now on!", pwn_name)
-                            pwn_name = "main.name = \"" + pwn_name + "\"\n"
+                            print("I shall go by %s from now on!" % pwn_name)
+                            pwn_name = "main.name = \"%s\"\n" % pwn_name
                             f.write(pwn_name)
                         else:
                             print("You have chosen an invalid name. Please start over.")
@@ -208,8 +208,8 @@ if __name__ == '__main__':
                         for x in range(int(pwn_whitelist)):
                             ssid = input("SSID (Name): ")
                             bssid = input("BSSID (MAC): ")
-                            f.write("\t\"" + ssid + "\",\n")
-                            f.write("\t\"" + bssid + "\",\n")
+                            f.write("\t\"%s\",\n" % ssid)
+                            f.write("\t\"%s\",\n" % bssid)
                         f.write("]\n")
                     # set bluetooth tether
                     pwn_bluetooth = input("Do you want to enable BT-Tether? [Y/N] ")
@@ -218,14 +218,14 @@ if __name__ == '__main__':
                         pwn_bluetooth_device = input("What device do you use? Android or iOS? ")
                         if pwn_bluetooth_device.lower() == "android":
                             f.write("main.plugins.bt-tether.devices.android-phone.enabled = true\n")
-                            pwn_bluetooth_mac = input("What is the Bluetooth MAC of your device? ")
+                            pwn_bluetooth_mac = input("What is the bluetooth MAC of your device? ")
                             if pwn_bluetooth_mac != "":
-                                f.write("main.plugins.bt-tether.devices.android-phone.mac = \""+pwn_bluetooth_mac+"\"\n")
+                                f.write("main.plugins.bt-tether.devices.android-phone.mac = \"%s\"\n" % pwn_bluetooth_mac)
                         elif pwn_bluetooth_device.lower() == "ios":
                             f.write("main.plugins.bt-tether.devices.ios-phone.enabled = true\n")
-                            pwn_bluetooth_mac = input("What is the Bluetooth MAC of your device? ")
+                            pwn_bluetooth_mac = input("What is the bluetooth MAC of your device? ")
                             if pwn_bluetooth_mac != "":
-                                f.write("main.plugins.bt-tether.devices.android-phone.mac = \"" + pwn_bluetooth_mac + "\"\n")
+                                f.write("main.plugins.bt-tether.devices.ios-phone.mac = \"%s\"\n" % pwn_bluetooth_mac)
                     # set up display settings
                     pwn_display_enabled = input("Do you use a display? [Y/N] ")
                     if pwn_display_enabled.lower() in ('y', 'yes'):