Fix to work with Python 3.
Tidy up indentation.