diff --git a/pylintrc b/pylintrc
index 64c8c0dd..2457a37b 100644
--- a/pylintrc
+++ b/pylintrc
@@ -3,14 +3,20 @@
 [Master]
 
 [Messages Control]
+
+# http://pylint-messages.wikidot.com/all-codes
 # NOTE(justinsb): We might want to have a 2nd strict pylintrc in future
 # C0111: Don't require docstrings on every method
-# W0511: TODOs in code comments are fine.
+# R0912: Too many branches (huh)
+# R0914: Too many local variables is odd.
 # W0142: *args and **kwargs are fine.
+# W0511: TODOs in code comments are fine.
+# W0613: Unused argument '??' should be ok (they are useful sometimes to know intention of variable)
 # W0622: Redefining id is fine.
-disable=C0111,W0142,W0622,C0301,R0902,R0201
+disable=C0111,W0142,W0622,C0301,R0902,R0201,R0914,W0613,R0912
 
 [Basic]
+
 # Variable names can be 1 to 31 characters long, with lowercase and underscores
 variable-rgx=[a-z_][a-z0-9_]{0,30}$
 
@@ -25,6 +31,7 @@ method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
 no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$
 
 [Design]
+
 max-public-methods=100
 min-public-methods=0
 max-args=6
@@ -33,5 +40,3 @@ max-args=6
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.
-# _ is used by our localization
-additional-builtins=_