Oops, accidental commit
Oops, fix whitespace and Python 2 syntax error