diff --git a/apps/app/modaltest/main-page.ts b/apps/app/modaltest/main-page.ts
index 1ed90cb7f..f239861f4 100644
--- a/apps/app/modaltest/main-page.ts
+++ b/apps/app/modaltest/main-page.ts
@@ -1,4 +1,7 @@
-import { View, EventData } from "tns-core-modules/ui/core/view";
+import {
+    View,
+    EventData
+} from "tns-core-modules/ui/core/view";
 
 export function onNavigatingTo(args: EventData) {
     const page = args.object;
diff --git a/apps/app/modaltest/modal-tab.ts b/apps/app/modaltest/modal-tab.ts
index 224dcf81b..4e200669b 100644
--- a/apps/app/modaltest/modal-tab.ts
+++ b/apps/app/modaltest/modal-tab.ts
@@ -1,4 +1,7 @@
-import { View, EventData } from "tns-core-modules/ui/core/view";
+import {
+    View,
+    EventData
+} from "tns-core-modules/ui/core/view";
 
 const colors = ["red", "orange", "magenta"];
 let x = 0;
@@ -14,26 +17,40 @@ export function onLiveSync() {
 export function pageLoaded(args: EventData) {
     const view = args.object as View;
     const page = view.page;
-    console.log("Page loaded: " + page + ", isLoaded: " + page.isLoaded);
-    console.log("Frame: " + page.frame + ", currentPage: " + page.frame.currentPage);
+    console.log(`Page loaded: ${page}, isLoaded: ${page.isLoaded}`);
+    console.log(`Frame: ${page.frame}, currentPage: ${page.frame.currentPage}`);
 }
 
 export function onTap(args) {
     const view = args.object as View;
     const page = view.page;
     let context = page.bindingContext || 0;
-    page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
+    page.frame.navigate({
+        moduleName: "modaltest/page.2",
+        bindingContext: ++context,
+        transition: {
+            name: "fade",
+            duration: 1000
+        }
+    });
 }
 
 export function tenGoBacks(args) {
     const view = args.object as View;
     const page = view.page;
     const frame = page.frame;
-    
+
     let context = page.bindingContext || 0;
     let x = 4;
     while (x--) {
-        frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
+        frame.navigate({
+            moduleName: "modaltest/page.2",
+            bindingContext: ++context,
+            transition: {
+                name: "fade",
+                duration: 1000
+            }
+        });
     }
 
     x = 4;
diff --git a/apps/app/modaltest/page.2.ts b/apps/app/modaltest/page.2.ts
index affa4d90b..2c2a61eee 100644
--- a/apps/app/modaltest/page.2.ts
+++ b/apps/app/modaltest/page.2.ts
@@ -1,4 +1,8 @@
-import { View, EventData, ShownModallyData } from "tns-core-modules/ui/core/view";
+import {
+    View,
+    EventData,
+    ShownModallyData
+} from "tns-core-modules/ui/core/view";
 
 var x = 0;
 
@@ -17,7 +21,14 @@ export function onTap(args: EventData) {
     const view = args.object as View;
     const page = view.page;
     let context = page.bindingContext || 0;
-    page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
+    page.frame.navigate({
+        moduleName: "modaltest/page.2",
+        bindingContext: ++context,
+        transition: {
+            name: "fade",
+            duration: 1000
+        }
+    });
 }
 
 export function onBack(args: EventData) {
@@ -33,7 +44,7 @@ export function closeModal(args: EventData) {
 let modalContext = 0;
 export function showModal(args: EventData) {
     (args.object as View).showModal("modaltest/page.2", ++modalContext, function () {
-        console.log("Closed Modal: " + (args.object as View).bindingContext);
+        console.log(`Closed Modal: ${(args.object as View).bindingContext}`);
     });
 }