diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0e8b835..529d549 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -18,8 +18,8 @@
       <file leaf-file-name="Janitor.rb" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Janitor.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
+            <state relative-caret-position="480">
+              <caret line="33" column="6" lean-forward="false" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="6" />
               <folding />
             </state>
           </provider>
@@ -28,8 +28,8 @@
       <file leaf-file-name="notification.rb" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/notification.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" />
+            <state relative-caret-position="140">
+              <caret line="7" column="2" lean-forward="false" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
               <folding />
             </state>
           </provider>
@@ -269,12 +269,12 @@
       <option name="presentableId" value="Default" />
       <updated>1492353576138</updated>
       <workItem from="1492353577745" duration="1817000" />
-      <workItem from="1492433677612" duration="8421000" />
+      <workItem from="1492433677612" duration="8556000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10238000" />
+    <option name="totallyTimeSpent" value="10373000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="27" width="1920" height="1020" extended-state="6" />
@@ -334,14 +334,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Janitor.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/core.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
@@ -350,10 +342,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Janitor.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="33" column="6" lean-forward="false" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="6" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/notification.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" />
+        <state relative-caret-position="140">
+          <caret line="7" column="2" lean-forward="false" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" />
           <folding />
         </state>
       </provider>
diff --git a/Janitor.rb b/Janitor.rb
index 6b1b7cb..b7f9eaa 100644
--- a/Janitor.rb
+++ b/Janitor.rb
@@ -31,7 +31,6 @@ class Janitor
     if global == true
       return @ts.command('servernotifyregister', event: 'textserver')[0]
     else
-      move_self('218')
       return @ts.command('servernotifyregister', event: 'textchannel', id: 218 )[0]
     end
   end
diff --git a/notification.rb b/notification.rb
index 1d2745c..f0af998 100644
--- a/notification.rb
+++ b/notification.rb
@@ -4,15 +4,15 @@
 
   i = 1
   jan = Janitor.new
+  jan.move_self('218')
+
   while (i > 0)
 	begin
 
-    if i > 0
-			return_report = jan.listen(false)
+		return_report = jan.listen(false)
 
-			invokerid = return_report['invokerid']
-			cmd = return_report['msg']
-    end
+		invokerid = return_report['invokerid']
+		cmd = return_report['msg']
 
 		puts cmd + " - " + invokerid.to_s
 		if cmd == '!help'