Modified for PEP8 compliance

This brings the code up to date with the [PEP8 style guide](http://www.python.org/dev/peps/pep-0008/).