Update to comply with Python style guide PEP-8

http://www.python.org/dev/peps/pep-0008/