diff --git a/.gitignore b/.gitignore
index de0c25c5c..573eb0612 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,7 @@
-### Java ###
+### Java files ###
 *.class
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
+# Package Files
 #*.jar
 *.war
 *.ear
@@ -13,43 +10,23 @@
 hs_err_pid*
 
 
+
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
+# Ignore project files
 *.iml
 
-## Directory-based project format:
+# Ignore IDEA directory
 .idea/*
+
 # Include the project's code style settings file
 !.idea/codeStyleSettings.xml
 
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
+# File-based project format:
 *.ipr
 *.iws
 
-## Plugin-specific files:
-
+### Plugin-specific files: ###
 # IntelliJ
 /out/
 
@@ -65,6 +42,7 @@ crashlytics.properties
 crashlytics-build.properties
 
 
+
 ### Eclipse ###
 *.pydevproject
 .metadata
@@ -104,6 +82,7 @@ local.properties
 .texlipse
 
 
+
 ### Maven ###
 target/
 pom.xml.tag
@@ -115,6 +94,7 @@ dependency-reduced-pom.xml
 buildNumber.properties
 
 
+
 ### NetBeans ###
 nbproject/private/
 build/
@@ -125,5 +105,8 @@ nbactions.xml
 nb-configuration.xml
 .nb-gradle/
 
+
+
+### Git ###
 # Don't exclude the .gitignore itself
 !.gitignore