diff --git a/Gtk3/gtk136_keyboard_test/src/main.cpp b/Gtk3/gtk136_keyboard_test/src/main.cpp
index a0828d5..09cb01e 100644
--- a/Gtk3/gtk136_keyboard_test/src/main.cpp
+++ b/Gtk3/gtk136_keyboard_test/src/main.cpp
@@ -1,86 +1,88 @@
 /*
    gcc or g++ or clang -Wall keyboard1.c -o keyboard1 `pkg-config --cflags --libs gtk+-3.0`
-   Tested with GTK3.24 on Manjaro Linux with clang 14.0.6   
+   Tested with GTK3.24 on Manjaro Linux with clang 14.0.6
 */
-#include<gtk/gtk.h>
+#include <gtk/gtk.h>
 
-struct key{
+struct key
+{
     gint id;
     GtkWidget *button;
-  };
+};
 
-static const gchar letters[19]="QWERTYASDFGHZXCVBN";
-//Need single chars as strings.
-static gchar single_char[2]={'A', '\0'};
+static const gchar letters[19] = "QWERTYASDFGHZXCVBN";
+// Need single chars as strings.
+static gchar single_char[2] = {'A', '\0'};
 
 static void button_clicked(GtkWidget *button, gpointer *user_data)
-  {
-    gpointer button_index = g_hash_table_lookup((GHashTable*)user_data[0], button);
-    g_print("Button index %i\n", *((gint*)button_index));
-    gint index = *((gint*)button_index);
-    single_char[0]=letters[index];
-    gchar *string=g_strdup_printf("%s%s", gtk_entry_get_text(GTK_ENTRY(user_data[1])), single_char);
+{
+    gpointer button_index = g_hash_table_lookup((GHashTable *)user_data[0], button);
+    g_print("Button index %i\n", *((gint *)button_index));
+    gint index = *((gint *)button_index);
+    single_char[0] = letters[index];
+    gchar *string = g_strdup_printf("%s%s", gtk_entry_get_text(GTK_ENTRY(user_data[1])), single_char);
     gtk_entry_set_text(GTK_ENTRY(user_data[1]), string);
     g_free(string);
-  }
+}
+
 int main(int argc, char *argv[])
-  {
-    gtk_init (&argc, &argv);
-    gint i=0;
-    gint j=0;
-    
-    GtkWidget *window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+{
+    gtk_init(&argc, &argv);
+    gint i = 0;
+    gint j = 0;
+
+    GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(window), "Keyboard");
     gtk_window_set_default_size(GTK_WINDOW(window), 400, 200);
     gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
     g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
-    GtkWidget *entry=gtk_entry_new();
+    GtkWidget *entry = gtk_entry_new();
     gtk_widget_set_hexpand(entry, TRUE);
 
-    //Save buttons in an array.
+    // Save buttons in an array.
     struct key k1;
-    GArray *keyboard=g_array_new(FALSE, FALSE, sizeof(struct key));    
-    for(i=0;i<18;i++)
-      {
-        single_char[0]=letters[i];
-        k1.id=i;
-        k1.button=gtk_button_new_with_label(single_char);
+    GArray *keyboard = g_array_new(FALSE, FALSE, sizeof(struct key));
+    for (i = 0; i < 18; i++)
+    {
+        single_char[0] = letters[i];
+        k1.id = i;
+        k1.button = gtk_button_new_with_label(single_char);
         g_array_append_val(keyboard, k1);
-      }   
- 
-    //A hash table to look up array index values.
-    struct key *p1=NULL;
-    GHashTable *hash_table=g_hash_table_new(NULL, NULL);
-    for(i=0;i<18;i++)
-      {
-        p1=&g_array_index(keyboard, struct key, i);
-        g_hash_table_insert(hash_table, p1->button, &(p1->id));
-      }
+    }
 
-    gpointer user_data[2]={hash_table, entry};
-    GtkWidget *grid1=gtk_grid_new();
-    for(i=0;i<3;i++)
-      {
-        for(j=0;j<6;j++)
-          {
-            p1=&g_array_index(keyboard, struct key, i*6+j);
+    // A hash table to look up array index values.
+    struct key *p1 = NULL;
+    GHashTable *hash_table = g_hash_table_new(NULL, NULL);
+    for (i = 0; i < 18; i++)
+    {
+        p1 = &g_array_index(keyboard, struct key, i);
+        g_hash_table_insert(hash_table, p1->button, &(p1->id));
+    }
+
+    gpointer user_data[2] = {hash_table, entry};
+    GtkWidget *grid1 = gtk_grid_new();
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 0; j < 6; j++)
+        {
+            p1 = &g_array_index(keyboard, struct key, i * 6 + j);
             gtk_grid_attach(GTK_GRID(grid1), p1->button, j, i, 1, 1);
             g_signal_connect(p1->button, "clicked", G_CALLBACK(button_clicked), user_data);
-          }
-      } 
+        }
+    }
 
-    GtkWidget *scroll=gtk_scrolled_window_new(NULL, NULL);
+    GtkWidget *scroll = gtk_scrolled_window_new(NULL, NULL);
     gtk_widget_set_vexpand(scroll, TRUE);
     gtk_widget_set_hexpand(scroll, TRUE);
     gtk_container_add(GTK_CONTAINER(scroll), grid1);
 
-    GtkWidget *expander=gtk_expander_new("Keyboard");
+    GtkWidget *expander = gtk_expander_new("Keyboard");
     gtk_widget_set_vexpand(expander, TRUE);
     gtk_widget_set_hexpand(expander, TRUE);
     gtk_container_add(GTK_CONTAINER(expander), scroll);
 
-    GtkWidget *grid2=gtk_grid_new();
+    GtkWidget *grid2 = gtk_grid_new();
     gtk_grid_attach(GTK_GRID(grid2), expander, 0, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(grid2), entry, 0, 1, 1, 1);
 
@@ -94,4 +96,4 @@ int main(int argc, char *argv[])
     g_array_free(keyboard, TRUE);
 
     return 0;
-  }  
\ No newline at end of file
+}
\ No newline at end of file