diff --git a/apps/widscrlock/ChangeLog b/apps/widscrlock/ChangeLog
index e6d9f3512..94a8dccec 100644
--- a/apps/widscrlock/ChangeLog
+++ b/apps/widscrlock/ChangeLog
@@ -1,2 +1,3 @@
 0.01: 25/Jun/2022 Added Screenlock widget to depository.
 0.02: 26/Jun/2022 Tidied up graphics. Fixed versioning style...
+0.03: 28/Jun/2022 Tidied up code.
\ No newline at end of file
diff --git a/apps/widscrlock/widget.js b/apps/widscrlock/widget.js
index 27ba2df07..cbb71e4cc 100644
--- a/apps/widscrlock/widget.js
+++ b/apps/widscrlock/widget.js
@@ -1,14 +1,10 @@
 // Screenlock Widget
 
 (() => {
-	var widX = 0;
-	var widY = 0;
 	function draw() {
 		// Draw icon.
 		g.reset();
-		widX = this.x;
-		widY = this.y;
-		g.drawImage(atob("GBiDAkkkkiSSSUkkkkkkiSSSSSUkkkkiSSf/ySSUkkkSSf///ySSkkiST/ySf+SQUkiST+SST+SAUkSSfySSSfwACkSSfySSSewACiSSfySSSWwAASSSfySSSGwAASSSfySSQGwAASST///+222AASST///2222AASST//+A222AASST//wAG22AASST/+AAA22AASST/2wAG22AAUST+22A222ACkiT222A222ACkiSG22A22wAUkkQA22222ACkkkiAG222wAUkkkkSAAAAASkkkkkkSQACSkkkg=="),widX,widY);
+		g.drawImage(atob("GBiDAkkkkiSSSUkkkkkkiSSSSSUkkkkiSSf/ySSUkkkSSf///ySSkkiST/ySf+SQUkiST+SST+SAUkSSfySSSfwACkSSfySSSewACiSSfySSSWwAASSSfySSSGwAASSSfySSQGwAASST///+222AASST///2222AASST//+A222AASST//wAG22AASST/+AAA22AASST/2wAG22AAUST+22A222ACkiT222A222ACkiSG22A22wAUkkQA22222ACkkkiAG222wAUkkkkSAAAAASkkkkkkSQACSkkkg=="),scrlock.x,scrlock.y);
 	}
 
 	// add widget.
@@ -18,7 +14,7 @@
 		draw:draw // Draw widget.
 	};
 
-	setInterval(()=>WIDGETS.widscrlock.draw(), 60000);
+	var scrlock = WIDGETS.widscrlock;
 
 	function restoreTimeout(){
 		// Restore LCDTimeout settings.
@@ -27,7 +23,7 @@
 
 	var options = [];
 	Bangle.on('touch', function(button, xy) {
-		if(xy.x>=widX && xy.x<=widX+23 && xy.y>=widY && xy.y<=widY+23) {
+		if(xy.x>=scrlock.x && xy.x<=scrlock.x+23 && xy.y>=scrlock.y && xy.y<=scrlock.y+23) {
 			options = Bangle.getOptions(); // Store current Timeout settings.
 			Bangle.setLCDTimeout(0.1); // Lock screen.
 			setTimeout(restoreTimeout, 1000);