Fixed mixed tabs and whitespaces; fixed indentation levels.

The mix of tabs and spaces was driving me bonkers, and made it really hard to tell what was going on in github.