Formatting changes according to PEP 8 http://www.python.org/dev/peps/pep-0008/