diff --git a/Demo/scripts/beer.py b/Demo/scripts/beer.py
index 1b9ac8bade3..e331cc9f840 100644
--- a/Demo/scripts/beer.py
+++ b/Demo/scripts/beer.py
@@ -1,14 +1,20 @@
 #! /usr/bin/env python
+
 # By GvR, demystified after a version by Fredrik Lundh.
+
 import sys
+
 n = 100
-if sys.argv[1:]: n = int(sys.argv[1])
+if sys.argv[1:]:
+    n = int(sys.argv[1])
+
 def bottle(n):
     if n == 0: return "no more bottles of beer"
     if n == 1: return "one bottle of beer"
     return str(n) + " bottles of beer"
-for i in range(n):
-    print bottle(n-i), "on the wall,"
-    print bottle(n-i) + "."
+
+for i in range(n, 0, -1):
+    print bottle(i), "on the wall,"
+    print bottle(i) + "."
     print "Take one down, pass it around,"
-    print bottle(n-i-1), "on the wall."
+    print bottle(i-1), "on the wall."