It looks like the remainder of the diff consists of reformatting. We haven't talked about code style yet, but it looks like you're using some auto-formatter. I'm generally in favor of that (I use one myself in Eclipse for Java - I haven't looked into it yet for Python), but we should make sure that everybody's using the same one, otherwise we get edit wars between formatters messing up all our diffs.