I don't like that you changed the indentation from tabs to spaces. It makes it really hard to see the relevant changes.