diff --git a/docs/code_structure.md b/docs/code_structure.md
index 5f160fbe7..2550c905e 100644
--- a/docs/code_structure.md
+++ b/docs/code_structure.md
@@ -11,7 +11,6 @@ permalink: code_structure.html
  * hoodie-common     : Common code shared between different artifacts of Hoodie
 
 
- We have embraced the [Google Java code style](https://google.github.io/styleguide/javaguide.html). Please setup your IDE accordingly with style files from [here] (https://github.com/google/styleguide)
 
 
 
diff --git a/docs/dev_setup.md b/docs/dev_setup.md
index 2e83f201a..2fc34677f 100644
--- a/docs/dev_setup.md
+++ b/docs/dev_setup.md
@@ -5,6 +5,10 @@ sidebar: mydoc_sidebar
 permalink: dev_setup.html
 ---
 
-Work In Progress
+### Code Style
+
+ We have embraced the [Google Java code style](https://google.github.io/styleguide/javaguide.html). Please setup your IDE accordingly with style files from [here](https://github.com/google/styleguide/blob/gh-pages/intellij-java-google-style.xml)
+ Also recommend setting up the [Save Action Plugin](https://plugins.jetbrains.com/plugin/7642-save-actions) to auto format & organize imports on save.
+