diff --git a/lib/markdown-preview-view.coffee b/lib/markdown-preview-view.coffee
index 0d5e2e5..9aecb47 100644
--- a/lib/markdown-preview-view.coffee
+++ b/lib/markdown-preview-view.coffee
@@ -1,9 +1,5 @@
-$ = require 'jquery'
-_ = require 'underscore'
-ScrollView = require 'scroll-view'
-{$$$} = require 'space-pen'
+{_, $, $$$, Editor, ScrollView} = require 'atom'
 roaster = require 'roaster'
-Editor = require 'editor'
 
 fenceNameToExtension =
   'bash': 'sh'
diff --git a/lib/markdown-preview.coffee b/lib/markdown-preview.coffee
index 90bb96f..671a6a5 100644
--- a/lib/markdown-preview.coffee
+++ b/lib/markdown-preview.coffee
@@ -1,4 +1,3 @@
-EditSession = require 'edit-session'
 MarkdownPreviewView = require './markdown-preview-view'
 
 module.exports =
@@ -9,9 +8,8 @@ module.exports =
     activePane = rootView.getActivePane()
     editSession = activePane.activeItem
 
-    isEditSession = editSession instanceof EditSession
-    hasMarkdownGrammar = editSession.getGrammar().scopeName == "source.gfm"
-    if not isEditSession or not hasMarkdownGrammar
+    isMarkdownEditor = editSession.getGrammar?()?.scopeName is "source.gfm"
+    unless isMarkdownEditor
       console.warn("Can not render markdown for '#{editSession.getUri() ? 'untitled'}'")
       return
 
diff --git a/spec/markdown-preview-spec.coffee b/spec/markdown-preview-spec.coffee
index fd40bc0..572e382 100644
--- a/spec/markdown-preview-spec.coffee
+++ b/spec/markdown-preview-spec.coffee
@@ -1,6 +1,5 @@
-RootView = require 'root-view'
-MarkdownPreviewView = require 'markdown-preview/lib/markdown-preview-view'
-{$$} = require 'space-pen'
+{$$, RootView} = require 'atom'
+MarkdownPreviewView = require '../lib/markdown-preview-view'
 
 describe "Markdown preview package", ->
   beforeEach ->
diff --git a/spec/markdown-preview-view-spec.coffee b/spec/markdown-preview-view-spec.coffee
index 1927df6..3da1e13 100644
--- a/spec/markdown-preview-view-spec.coffee
+++ b/spec/markdown-preview-view-spec.coffee
@@ -1,6 +1,5 @@
-MarkdownPreviewView = require 'markdown-preview/lib/markdown-preview-view'
-$ = require 'jquery'
-{$$$} = require 'space-pen'
+MarkdownPreviewView = require '../lib/markdown-preview-view'
+{$, $$$} = require 'atom'
 
 describe "MarkdownPreviewView", ->
   [buffer, preview] = []