diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index 6d9c452162..a0fe6cf811 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -394,7 +394,6 @@ function startup() {
     emojiCodeMap = emojiList.reduce(function (codeMap, currentEmojiInList, index) {
         if (
             currentEmojiInList && 
-            
             currentEmojiInList.code && 
             currentEmojiInList.code.length > 0 && 
             currentEmojiInList.code[UTF_CODE]) {
@@ -423,7 +422,7 @@ function startup() {
 
     function AviMoji() {
         _this = this;
-        this._avimojiQMLWindow;
+        this._avimojiQMLWindow = null;
     }
 
     AviMoji.prototype = {
@@ -435,20 +434,11 @@ function startup() {
 }
 
 
-// #endregion
-// *************************************
-// END main
-// *************************************
-
-// *************************************
-// START API
-// *************************************
-// #region API
-
 function registerAvimojiQMLWindow(avimojiQMLWindow) {
     this._avimojiQMLWindow = avimojiQMLWindow;
 }
 
+
 function addEmojiFromQML(code) {
     var emojiObject = emojiList[emojiCodeMap[code]];
     var emojiFilename;
@@ -461,6 +451,7 @@ function addEmojiFromQML(code) {
     handleSelectedEmoji(emojiFilename);
 }
 
+
 function unload() {
     resetEmojis();
     if (signalsConnected) {
@@ -470,11 +461,7 @@ function unload() {
     }
 }
 
+
 var aviMoji = startup();
 
-module.exports = aviMoji;
-
-// #endregion
-// *************************************
-// END API
-// *************************************
\ No newline at end of file
+module.exports = aviMoji;
\ No newline at end of file
diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
index d1396c8ccf..abf0dd73e8 100644
--- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
+++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
@@ -38,7 +38,6 @@ var customEmojiList = Script.require("./emojiApp/resources/modules/customEmojiLi
 // #region EMOTE_UTILITY
 
 
-
 function updateEmoteAppBarPosition() {
     if (!emoteAppBarWindow) {
         return;
@@ -548,7 +547,7 @@ var emojiAPI = Script.require("./emojiApp/simplifiedEmoji.js");
 var keyPressSignalsConnected = false;
 var emojiCodeMap;
 var customEmojiCodeMap;
-function init() {
+function setup() {
     deleteOldReticles();
 
     // make a map of just the utf codes to help with accesing
@@ -755,4 +754,4 @@ function toggleEmojiApp() {
 // END EMOJI
 // *************************************
 
-init();
\ No newline at end of file
+setup();
\ No newline at end of file