diff --git a/bin/CsvJoiner.py b/bin/CsvJoiner.py
index c7e9b75..58153d6 100644
--- a/bin/CsvJoiner.py
+++ b/bin/CsvJoiner.py
@@ -503,9 +503,7 @@
 	"ZWE":"716"
 }
 
-sedoc = {}
-for k in codes:
-	sedoc[codes[k]] = k
+sedoc = {codes[k]: k for k in codes}
 	
 def main(argv):
 	a = sys.argv[1]
diff --git a/bin/avgRegistrationResponseTimes b/bin/avgRegistrationResponseTimes
index 87726f1..79a480d 100755
--- a/bin/avgRegistrationResponseTimes
+++ b/bin/avgRegistrationResponseTimes
@@ -23,8 +23,8 @@ def registrationsFromFile(counter, arg):
         line = f.readline()
         if not line: break
         numOf, timeOf = registrationsFromLine(counter, line.rstrip())
-        totalNumOf = totalNumOf + numOf
-        totalTimeOf = totalTimeOf + timeOf
+        totalNumOf += numOf
+        totalTimeOf += timeOf
     return totalNumOf, totalTimeOf
 
 # The "main"
diff --git a/bin/drawDeps.py b/bin/drawDeps.py
index a23e5bf..1ebc7fc 100644
--- a/bin/drawDeps.py
+++ b/bin/drawDeps.py
@@ -57,12 +57,9 @@
 def nextOrder(modules, deps, ordered, unordered, fileName):
   order = set()
   for module in unordered:
-    isOrd = True
-    for (left, right) in deps:
-      if module == left:
-        if right not in ordered:
           # It's not already ordered, so this is not this order
-          isOrd = False
+    isOrd = not any(module == left and right not in ordered
+                    for (left, right) in deps)
     if isOrd:
       order.add(module)
 
@@ -81,11 +78,8 @@ def nextOrder(modules, deps, ordered, unordered, fileName):
 def nextGeneration(modules, deps, gened, ungened, fileName):
   gen = set()
   for module in ungened:
-    isGen = True
-    for (left, right) in deps:
-      if module == right:
-        if left not in gened:
-          isGen = False
+    isGen = not any(module == right and left not in gened
+                    for (left, right) in deps)
     if isGen:
       gen.add(module)
 
diff --git a/geo/CountryCodeToName.py b/geo/CountryCodeToName.py
index 9d87d33..e86c988 100644
--- a/geo/CountryCodeToName.py
+++ b/geo/CountryCodeToName.py
@@ -503,9 +503,7 @@
 	"ZWE":"716"
 }
 
-sedoc = {}
-for k in codes:
-	sedoc[codes[k]] = k
+sedoc = {codes[k]: k for k in codes}
 	
 def main(argv):
 	a = sys.argv[1]
diff --git a/geo/geohash.py b/geo/geohash.py
index 8a35fe4..c474c8d 100644
--- a/geo/geohash.py
+++ b/geo/geohash.py
@@ -62,15 +62,15 @@ def _encode_i2c(lat,lon,lat_length,lon_length):
         else:
                 a = lat
                 b = lon
-        
+
         boost = (0,1,4,5,16,17,20,21)
         ret = ''
-        for i in range(precision):
+        for _ in range(precision):
                 ret+=_base32[(boost[a&7]+(boost[b&3]<<1))&0x1F]
                 t = a>>3
                 a = b>>2
                 b = t
-        
+
         return ret[::-1]
 
 def encode(latitude, longitude, precision=12):
@@ -131,8 +131,8 @@ def _decode_c2i(hashcode):
         for i in hashcode:
                 t = _base32_map[i]
                 if bit_length%2==0:
-                        lon = lon<<3
-                        lat = lat<<2
+                        lon <<= 3
+                        lat <<= 2
                         lon += (t>>2)&4
                         lat += (t>>2)&2
                         lon += (t>>1)&2
@@ -141,8 +141,8 @@ def _decode_c2i(hashcode):
                         lon_length+=3
                         lat_length+=2
                 else:
-                        lon = lon<<2
-                        lat = lat<<3
+                        lon <<= 2
+                        lat <<= 3
                         lat += (t>>2)&4
                         lon += (t>>2)&2
                         lat += (t>>1)&2
@@ -150,9 +150,9 @@ def _decode_c2i(hashcode):
                         lat += t&1
                         lon_length+=2
                         lat_length+=3
-                
+
                 bit_length+=5
-        
+
         return (lat,lon,lat_length,lon_length)
 
 def decode(hashcode, delta=False):
diff --git a/geo/ppidCounts2kml.py b/geo/ppidCounts2kml.py
index f0b7dee..6cad6c8 100755
--- a/geo/ppidCounts2kml.py
+++ b/geo/ppidCounts2kml.py
@@ -20,7 +20,7 @@ def run(self):
     #print geohash.bbox("u27")
     i = 0
     for csv in self.csvs:
-      i = i + 1
+      i += 1
       place = self.processPlace(csv, i)
       self.csvs[i - 1] = place
       if i == 1001: