diff --git a/main.ino b/main.ino
index 953a453..041900f 100644
--- a/main.ino
+++ b/main.ino
@@ -7,28 +7,28 @@
 #include <SpotifyArduino.h>
 #include <ArduinoJson.h>
 
-#define SCREEN_WIDTH 128 // OLED display width, in pixels
-#define SCREEN_HEIGHT 64 // OLED display height, in pixels
+#define SCREEN_WIDTH 128
+#define SCREEN_HEIGHT 64
 
 // Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
 Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, -1);
 
-char ssid[] = "";         // your network SSID (name)
-char password[] = ""; // your network password
+char ssid[] = "";
+char password[] = "";
+
+char clientId[] = "";
+char clientSecret[] = "";
 
-char clientId[] = "";     // Your client ID of your Spotify APP
-char clientSecret[] = ""; // Your client Secret of your Spotify APP (Do Not share this!)
 
-// Country code, including this is advisable
 #define SPOTIFY_MARKET "US"
 
-#define SPOTIFY_REFRESH_TOKEN "" // a really long string of characters, do some reasearch to find refresh token
+#define SPOTIFY_REFRESH_TOKEN ""
 
 WiFiClientSecure client;
 SpotifyArduino spotify(client, clientId, clientSecret, SPOTIFY_REFRESH_TOKEN);
 
-unsigned long delayBetweenRequests = 10000; // Time between requests (10 seconds)
-unsigned long requestDueTime;               // Time when request is due
+unsigned long delayBetweenRequests = 10000;
+unsigned long requestDueTime;
 
 void setup() {
     Serial.begin(115200);
@@ -36,7 +36,6 @@ void setup() {
     WiFi.begin(ssid, password);
     Serial.println("");
 
-    // Wait for connection
     while (WiFi.status() != WL_CONNECTED)
     {
         delay(500);
@@ -48,23 +47,17 @@ void setup() {
     Serial.print("IP address: ");
     Serial.println(WiFi.localIP());   
 #if defined(ESP8266)
-    client.setFingerprint(SPOTIFY_FINGERPRINT); // These expire every few months
+    client.setFingerprint(SPOTIFY_FINGERPRINT);
 #elif defined(ESP32)
     client.setCACert(spotify_server_cert);
 #endif
-    // ... or don't!
-    //client.setInsecure();
-
-    // If you want to enable some extra debugging
-    // uncomment the "#define SPOTIFY_DEBUG" in SpotifyArduino.h
-
     Serial.println("Refreshing Access Tokens");
     if (!spotify.refreshAccessToken())
     {
         Serial.println("Failed to get access tokens");
     }
 
-    if(!display.begin(SSD1306_SWITCHCAPVCC, 0x3C)) { // Address 0x3D for 128x64
+    if(!display.begin(SSD1306_SWITCHCAPVCC, 0x3C)) {
         Serial.println(F("SSD1306 allocation failed"));
         for(;;);
     }
@@ -80,7 +73,7 @@ void printCurrentlyPlayingToDisplay(CurrentlyPlaying currentlyPlaying) {
     display.println("Currently Playing:");
     display.println(currentlyPlaying.trackName);
     display.println("by");
-    display.println(currentlyPlaying.artists[0].artistName); // Assuming only one artist is printed
+    display.println(currentlyPlaying.artists[0].artistName);
     display.display();
 }
 
@@ -92,7 +85,6 @@ void loop()
         Serial.println(ESP.getFreeHeap());
 
         Serial.println("Getting currently playing song:");
-        // Market can be excluded if you want e.g. spotify.getCurrentlyPlaying()
         int status = spotify.getCurrentlyPlaying(printCurrentlyPlayingToDisplay, SPOTIFY_MARKET);
         if (status == 200)
         {