diff --git a/idea-plugin/.gitignore b/idea-plugin/.gitignore
index a6081c5c..7c3409af 100644
--- a/idea-plugin/.gitignore
+++ b/idea-plugin/.gitignore
@@ -10,8 +10,6 @@
 
 out
 gen
-JFlex.jar
-courier-idea-plugin.jar
+*.jar
 idea-flex.skeleton
-idea-flex_2.skeleton
 src/org/coursera/courier/CourierLexer.java
diff --git a/idea-plugin/META-INF/plugin.xml b/idea-plugin/META-INF/plugin.xml
index ad6c95cb..f1aa8820 100644
--- a/idea-plugin/META-INF/plugin.xml
+++ b/idea-plugin/META-INF/plugin.xml
@@ -1,7 +1,7 @@
-<idea-plugin version="2">
+<idea-plugin>
   <id>org.coursera.courier.plugin</id>
   <name>Courier schema language</name>
-  <version>1.6.0</version>
+  <version>1.6.1</version>
   <vendor url="https://groups.google.com/forum/#!forum/courier">Courier OSS Project</vendor>
 
   <description><![CDATA[
diff --git a/idea-plugin/README.md b/idea-plugin/README.md
index 49c86020..c4921d8b 100644
--- a/idea-plugin/README.md
+++ b/idea-plugin/README.md
@@ -15,6 +15,20 @@ Features:
   * Doc comment support
   * Optimize imports
 
+Hacker's Setup
+--------------
+
+   1. Import the `idea-plugin` directory using IntelliJ IDEA. Key ideas:
+      * You need need the IntelliJ IDEA SDK (not a Java SDK), and
+      * You need to **use the current idea-plugin.iml**
+   2. Go to each .bnf file using the project explorer, right-click, and "Generate Parser Code"
+      * src/org/coursera/courier/Courier.bnf
+      * src/org/coursera/courier/schemadoc/schemadoc.bnf
+   3. Go to the main .flex using the project explorer, right-click, and "Run JFlex Generator"
+      * src/org/coursera/courier/psi/Courier.flex
+   4. Build the project.
+   5. Test it by doing "Run > Run 'Courier Plugin' ".
+
 Making changes to the Schema language
 -------------------------------------
 
diff --git a/idea-plugin/idea-plugin.iml b/idea-plugin/idea-plugin.iml
new file mode 100644
index 00000000..260bdf79
--- /dev/null
+++ b/idea-plugin/idea-plugin.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PLUGIN_MODULE" version="4">
+  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea-plugin/idea-plugin.jar b/idea-plugin/idea-plugin.jar
deleted file mode 100644
index 0861cbc4..00000000
Binary files a/idea-plugin/idea-plugin.jar and /dev/null differ
diff --git a/idea-plugin/src/org/coursera/courier/NewCourierTypeAction.java b/idea-plugin/src/org/coursera/courier/NewCourierTypeAction.java
index fa5f439f..c8614bcc 100644
--- a/idea-plugin/src/org/coursera/courier/NewCourierTypeAction.java
+++ b/idea-plugin/src/org/coursera/courier/NewCourierTypeAction.java
@@ -114,6 +114,7 @@ protected final CourierTopLevel doCreate(
     }
   }
 
+  @NotNull
   public static String getNamespace(@NotNull PsiDirectory directory) {
     PsiPackage ns = JavaDirectoryService.getInstance().getPackage(directory);
     return ns != null ? ns.getQualifiedName() : "UNKNOWN";
@@ -157,11 +158,5 @@ protected void postProcess(CourierTopLevel createdElement, String templateName,
     }
   }
 
-  private static ArrayFactory<CourierTopLevel> ARRAY_FACTORY = new ArrayFactory<CourierTopLevel>() {
-    @NotNull
-    @Override
-    public CourierTopLevel[] create(int count) {
-      return new CourierTopLevel[count];
-    }
-  };
+  private static ArrayFactory<CourierTopLevel> ARRAY_FACTORY = count -> new CourierTopLevel[count];
 }
diff --git a/idea-plugin/src/org/coursera/courier/psi/TypeName.java b/idea-plugin/src/org/coursera/courier/psi/TypeName.java
index cc9d2224..24fe2587 100644
--- a/idea-plugin/src/org/coursera/courier/psi/TypeName.java
+++ b/idea-plugin/src/org/coursera/courier/psi/TypeName.java
@@ -1,8 +1,5 @@
 package org.coursera.courier.psi;
 
-import com.google.common.base.Strings;
-import com.intellij.openapi.util.text.StringUtil;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;