diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 29416047..4dc59bf7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ My **master** branch is a 100% stable (should be). I only push to it after I am
 certain that things are working out. Many people are using Jedi directly from
 the github master branch.
 
-**Please use PEP8 to style your code.**
+**Try to use the PEP8 style guide.**
 
 
 Changing Issues to Pull Requests (Github)
diff --git a/jedi/modules.py b/jedi/modules.py
index 594c9d80..e166e6f0 100644
--- a/jedi/modules.py
+++ b/jedi/modules.py
@@ -112,8 +112,7 @@ class ModuleWithCursor(Module):
             # Call the parser already here, because it will be used anyways.
             # Also, the position is here important (which will not be used by
             # default), therefore fill the cache here.
-            self._parser = fast.FastParser(self.source, self.path,
-                                                  self.position)
+            self._parser = fast.FastParser(self.source, self.path, self.position)
             # don't pickle that module, because it's changing fast
             cache.save_module(self.path, self.name, self._parser,
                               pickling=False)
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index 433c9042..57525425 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -921,10 +921,10 @@ class Statement(Simple):
                         # it's not possible to set it earlier
                         tok.parent = self
                 else:
-                    tok           = tok_temp.token
+                    tok = tok_temp.token
                     start_tok_pos = tok_temp.start_pos
-                    last_end_pos  = end_pos
-                    end_pos       = tok_temp.end_pos
+                    last_end_pos = end_pos
+                    end_pos = tok_temp.end_pos
                     if first:
                         first = False
                         start_pos = start_tok_pos
@@ -1056,9 +1056,9 @@ class Statement(Simple):
                 end_pos = tok.end_pos
             else:
                 token_type = tok_temp.token_type
-                tok        = tok_temp.token
-                start_pos  = tok_temp.start_pos
-                end_pos    = tok_temp.end_pos
+                tok = tok_temp.token
+                start_pos = tok_temp.start_pos
+                end_pos = tok_temp.end_pos
                 if is_assignment(tok):
                     # This means, there is an assignment here.
                     # Add assignments, which can be more than one