diff --git a/website/embed.html b/website/embed.html
index 879990f..8b6ef56 100644
--- a/website/embed.html
+++ b/website/embed.html
@@ -82,21 +82,13 @@
 	<!-- analytics end -->
 
 	<script type='text/javascript'>
-		var embed = null;
-		
 		$(window).on ('load', function () {
-			embed = new OV.Embed ({
+			let embed = new OV.Embed ({
 				viewerDiv : $('#embed_viewer'),
 				websiteLinkDiv : $('#website_link')
 			});
 			embed.Load ();
 		});
-		
-		$(window).on ('resize', function () {
-			if (embed !== null) {
-				embed.Resize ();
-			}
-		});
 	</script>
 </head>
 
diff --git a/website/index.html b/website/index.html
index 0e85d52..2808d18 100644
--- a/website/index.html
+++ b/website/index.html
@@ -79,10 +79,8 @@
 	<!-- website end -->
 
 	<script type='text/javascript'>
-		var website = null;
-
 		$(window).on ('load', function () {
-			website = new OV.Website ({
+			let website = new OV.Website ({
 				headerDiv : $('#header'),
 				toolbarDiv : $('#toolbar'),
 				mainDiv : $('#main'),
@@ -93,12 +91,6 @@
 			});
 			website.Load ();
 		});
-
-		$(window).on ('resize', function () {
-			if (website !== null) {
-				website.Resize ();
-			}
-		});
 	</script>
 
 	<!-- analytics start -->
diff --git a/website/o3dv/embed.js b/website/o3dv/embed.js
index 9b6ee6f..fc90441 100644
--- a/website/o3dv/embed.js
+++ b/website/o3dv/embed.js
@@ -25,6 +25,11 @@ OV.Embed = class
             let websiteUrl = this.parameters.websiteLinkDiv.attr ('href') + '#' + hashParameters;
             this.parameters.websiteLinkDiv.attr ('href', websiteUrl);
         }
+
+        let obj = this;
+		$(window).on ('resize', function () {
+			obj.Resize ();
+		});        
     }
 
     Resize ()
diff --git a/website/o3dv/website.js b/website/o3dv/website.js
index 8c14d64..1984567 100644
--- a/website/o3dv/website.js
+++ b/website/o3dv/website.js
@@ -32,6 +32,11 @@ OV.Website = class
         this.Resize ();
 
         this.OnHashChange ();
+
+        let obj = this;
+        $(window).on ('resize', function () {
+			obj.Resize ();
+		});
     }
 
     Resize ()