diff --git a/apps/cc_clock24/app.js b/apps/cc_clock24/app.js
index b075a41b6..1f94da318 100644
--- a/apps/cc_clock24/app.js
+++ b/apps/cc_clock24/app.js
@@ -1,4 +1,6 @@
 {
+    
+// ----- const -----
 
 const defaultSettings = {
   loadWidgets    : false,
@@ -21,17 +23,67 @@ const hourNumberPositions = (function() {
     let alpha = i * 2 * Math.PI / 60;
     let xsk = center.x + 2 + Math.cos(alpha) * (center.x - 10),
         ysk = center.y + 2 + Math.sin(alpha) * (center.x - 10);
+        
     if (sk==3){ xsk -= 10; }
     if (sk==6){ ysk -= 10; }
     if (sk==9){ xsk += 10; }
     if (sk==12){ ysk += 10; }
     if (sk==10){ xsk += 3; }
+    
     z.push([sk, xsk, ysk]);
     sk += 1;
   }
   return z;
 })();
 
+
+// ----- global vars -----
+
+let drawTimeout;
+let queueMillis = 1000;
+let unlock = true;
+
+
+// ----- functions -----
+
+const updateState = function() {
+  if (Bangle.isLCDOn()) {
+    if (!Bangle.isLocked()) {
+      queueMillis = 1000;
+      unlock = true;
+    }
+    else {
+      queueMillis = 60000;
+      unlock = false;
+    }
+    draw();
+  } 
+  else {
+    if (drawTimeout) 
+      clearTimeout(drawTimeout);
+    drawTimeout = undefined;
+  }
+};
+
+const drawScale = function() {  // draws the scale once the app is startet
+  // clear the screen
+  g.setBgColor(0, 0, 0);
+  g.clear();
+  
+  // draw the ticks of the scale
+  for (let i = -14; i < 47; i++){
+    const alpha = i * 2 * Math.PI/60;
+    let thickness = 2;
+    if (i % 5 == 0) { 
+      thickness = 5;
+    }
+    g.fillPoly(calcHandPolygon(300, thickness, alpha), true);
+    g.setColor(0, 0, 0);
+    g.fillRect(10, 10, 2 * center.x - 10, 2 * center.x - 10);
+    g.setColor(1, 1, 1);
+  }
+};
+
 const calcHandPolygon = function(len, dia, alpha) {
   const x = center.x + Math.cos(alpha) * len/2,
         y = center.y + Math.sin(alpha) * len/2,
@@ -53,6 +105,50 @@ const calcHandPolygon = function(len, dia, alpha) {
   return polygon;
 };
 
+
+// ----- draw ----
+
+const draw = function() {
+  // draw black rectangle in the middle to clear screen from scale and hands
+  g.setColor(0, 0, 0);
+  g.fillRect(10, 10, 2 * center.x - 10, 2 * center.x - 10);
+  // prepare for drawing the text
+  g.setFontAlign(0, 0);
+  // do drawing
+  drawNumbers();
+  
+  const date = new Date();
+  if (settings.textAboveHands) {
+    drawHands(date); 
+    drawText(date);
+  }
+  else {
+    drawText(date); 
+    drawHands(date);
+  }
+  queueDraw();
+};
+
+
+const drawNumbers = function() {
+  g.setFont("Vector", 20);
+  
+  const batteryState = E.getBattery();
+  if (batteryState < 20)
+    g.setColor(1, 0, 0);  // draw in red, if battery is low 
+  else
+    g.setColor(1, 1, 1);
+  
+  g.setBgColor(0, 0, 0);
+  for(let i = 0; i < 12; i++){
+    let hour = hourNumberPositions[i][0];
+    if (settings.show24HourMode)
+      hour *= 2;
+  
+    g.drawString(hour, hourNumberPositions[i][1], hourNumberPositions[i][2], true);
+  }
+};
+
 const drawHands = function(date) {
   let m = date.getMinutes(),
       h = date.getHours(), 
@@ -65,40 +161,35 @@ const drawHands = function(date) {
     h = h - numHoursForHourHand;
   }
   
-  // calculates the position of the minute, second and hour hand
-  h = 2 * Math.PI / numHoursForHourHand * (h + m/60) - Math.PI/2;
-  m = 2 * Math.PI / 60 * m - Math.PI/2;
-  s = 2 * Math.PI / 60 * s - Math.PI/2;
+  const hour_angle   = 2 * Math.PI / numHoursForHourHand * (h + m/60) - Math.PI/2,
+        minute_angle = 2 * Math.PI / 60 * m - Math.PI/2,
+        second_angle = 2 * Math.PI / 60 * s - Math.PI/2;
   
-  //g.setColor(1,0,0);
-  const hourPolygon = calcHandPolygon(settings.shortHrHand? 88 : 100, 5, h);
+  const hourPolygon = calcHandPolygon(settings.shortHrHand? 88 : 100, 5, hour_angle);
   g.fillPoly(hourPolygon, true);
-  //g.setColor(1, 1, 1);
-  const minutePolygon = calcHandPolygon(150, 5, m);
+  
+  const minutePolygon = calcHandPolygon(150, 5, minute_angle);
   g.fillPoly(minutePolygon, true);
+  
   if (unlock){
-    const secondPolygon = calcHandPolygon(150, 2, s);
+    const secondPolygon = calcHandPolygon(150, 2, second_angle);
     g.fillPoly(secondPolygon, true);
   }
   g.fillCircle(center.x, center.y, 4);
 };
 
 const drawText = function(date) {
+  if (!unlock)
+    return
+
   g.setFont("Vector", 10);
   g.setBgColor(0, 0, 0);
-  
-  const batteryState = E.getBattery();
-  if (batteryState < 20){
-     g.setColor(1, 0, 0);  // draw in red, if battery is low 
-  } else {
-     g.setColor(1, 1, 1);   
-  }
+  g.setColor(1, 1, 1);   
   
   const dateStr = require("locale").date(date);
   g.drawString(dateStr, center.x, center.y + 20, true);
   
-  
-  const batteryStr = batteryState + "%";
+  const batteryStr = E.getBattery() + "%";
   
   if (Bangle.isCharging()) {
     g.setBgColor(1, 0, 0);
@@ -106,86 +197,16 @@ const drawText = function(date) {
   g.drawString(batteryStr, center.x, center.y + 40, true);
 };
 
-const drawNumbers = function() {
-  //draws the numbers on the screen
-  g.setFont("Vector", 20);
-  g.setColor(1, 1, 1);
-  g.setBgColor(0, 0, 0);
-  for(let i = 0; i < 12; i++){
-    hour = hourNumberPositions[i][0];
-    if (settings.show24HourMode){
-      hour *= 2;
-    }
-    g.drawString(hour, hourNumberPositions[i][1], hourNumberPositions[i][2], true);
-  }
-};
-
-let drawTimeout;
-let queueMillis = 1000;
-let unlock = true;
-
-const updateState = function() {
-  if (Bangle.isLCDOn()) {
-    if (!Bangle.isLocked()) {
-      queueMillis = 1000;
-      unlock = true;
-    } else {
-      queueMillis = 60000;
-      unlock = false;
-    }
-    draw();
-  } else {
-    if (drawTimeout) clearTimeout(drawTimeout);
-    drawTimeout = undefined;
-  }
-};
-
 const queueDraw = function() {
-  if (drawTimeout) clearTimeout(drawTimeout);
+  if (drawTimeout) 
+    clearTimeout(drawTimeout);
+
   drawTimeout = setTimeout(function() {
     drawTimeout = undefined;
     draw();
   }, queueMillis - (Date.now() % queueMillis));
 };
 
-const draw = function() {
-  // draw black rectangle in the middle to clear screen from scale and hands
-  g.setColor(0, 0, 0);
-  g.fillRect(10, 10, 2 * center.x - 10, 2 * center.x - 10);
-  // prepare for drawing the text
-  g.setFontAlign(0, 0);
-  // do drawing
-  drawNumbers();
-  const date = new Date();
-  if (settings.textAboveHands) {
-    drawHands(date); 
-    drawText(date);
-  } else {
-    drawText(date); 
-    drawHands(date);
-  }
-  queueDraw();
-};
-
-//draws the scale once the app is startet
-const drawScale = function() {
-  // clear the screen
-  g.setBgColor(0, 0, 0);
-  g.clear();
-  
-  // draw the ticks of the scale
-  for (let i = -14; i < 47; i++){
-    const alpha = i * 2 * Math.PI/60;
-    let thickness = 2;
-    if (i % 5 == 0) { 
-      thickness = 5;
-    }
-    g.fillPoly(calcHandPolygon(300, thickness, alpha), true);
-    g.setColor(0, 0, 0);
-    g.fillRect(10, 10, 2 * center.x - 10, 2 * center.x - 10);
-    g.setColor(1, 1, 1);
-  }
-};
 
 //// main running sequence ////
 
@@ -211,7 +232,8 @@ Bangle.setUI({
 if (settings.loadWidgets) {
   Bangle.loadWidgets();
   require("widget_utils").swipeOn();
-} else if (global.WIDGETS) {
+} 
+else if (global.WIDGETS) {
   require("widget_utils").hide();
 }