Added support for python 2.6.

Also improved readability slightly.